From a3a2272690dd97c70c7641b09d7affdd24790aef Mon Sep 17 00:00:00 2001 From: Sergio Date: Wed, 24 Jul 2024 14:50:29 -0400 Subject: [PATCH 01/17] SCHED-715: Fix missing pyexplore dependency --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index fca0fba5..c1baef6d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -23,3 +23,4 @@ mercury bleach>=6.0.0 sortedcontainers redis +pyexplore From 1b65136a8a99611300d3dca1c2c9c86a141d6cb8 Mon Sep 17 00:00:00 2001 From: Sergio Date: Thu, 25 Jul 2024 18:16:33 -0400 Subject: [PATCH 02/17] SCHED-715: Add repo dependencies to pyexplore --- .github/workflows/run.yml | 14 ++++++++++++++ requirements.txt | 1 - 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.github/workflows/run.yml b/.github/workflows/run.yml index a1879403..65b57d76 100644 --- a/.github/workflows/run.yml +++ b/.github/workflows/run.yml @@ -24,6 +24,20 @@ - name: Add $PYTHONPATH run: echo "PYTHONPATH=/home/runner/work/scheduler/scheduler" >> $GITHUB_ENV + - name: Checkout private repo for pyexplore + uses: actions/checkout@v3 + with: + repository: stroncod/pyexplore + token: ${{ secrets.GH_PAT }} + path: /home/runner/work/scheduler/scheduler + + - name: Install requirements for pyexplore + run: | + pip install -r pyexplore/requirements.txt + - name: Install pyexplore as package + run: | + pip install -e pyexplore/pyexplore + - name: Run Greedymax env: REDISCLOUD_URL: ${{ secrets.REDISCLOUD_URL }} diff --git a/requirements.txt b/requirements.txt index c1baef6d..fca0fba5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -23,4 +23,3 @@ mercury bleach>=6.0.0 sortedcontainers redis -pyexplore From 2cbdd68409edd570acce79867dd0eff39887fbae Mon Sep 17 00:00:00 2001 From: Sergio Date: Thu, 25 Jul 2024 18:26:30 -0400 Subject: [PATCH 03/17] SCHED-715: Change checkout step to manual clone --- .github/workflows/run.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/run.yml b/.github/workflows/run.yml index 65b57d76..2b9de0f8 100644 --- a/.github/workflows/run.yml +++ b/.github/workflows/run.yml @@ -24,12 +24,11 @@ - name: Add $PYTHONPATH run: echo "PYTHONPATH=/home/runner/work/scheduler/scheduler" >> $GITHUB_ENV - - name: Checkout private repo for pyexplore - uses: actions/checkout@v3 - with: - repository: stroncod/pyexplore - token: ${{ secrets.GH_PAT }} - path: /home/runner/work/scheduler/scheduler + - name: Clone pyexplore + env: + GH_PAT: ${{ secrets.GH_PAT }} + run: | + git clone https://${GH_PAT}@github.com/stroncod/pyexplore.git . - name: Install requirements for pyexplore run: | From ff6b21206a90c22181107a058fe388994e08aa71 Mon Sep 17 00:00:00 2001 From: Sergio Date: Thu, 25 Jul 2024 18:29:22 -0400 Subject: [PATCH 04/17] SCHED-715: Change path to clone --- .github/workflows/run.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run.yml b/.github/workflows/run.yml index 2b9de0f8..1b2abc20 100644 --- a/.github/workflows/run.yml +++ b/.github/workflows/run.yml @@ -28,7 +28,7 @@ env: GH_PAT: ${{ secrets.GH_PAT }} run: | - git clone https://${GH_PAT}@github.com/stroncod/pyexplore.git . + git clone https://${GH_PAT}@github.com/stroncod/pyexplore.git ./pyexplore - name: Install requirements for pyexplore run: | From 74cdf604e00a1edc701c56bb7e30b906ba7963f4 Mon Sep 17 00:00:00 2001 From: Sergio Date: Thu, 25 Jul 2024 18:43:22 -0400 Subject: [PATCH 05/17] SCHED-715: Change path to clone --- .github/workflows/run.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run.yml b/.github/workflows/run.yml index 1b2abc20..1f0e0a38 100644 --- a/.github/workflows/run.yml +++ b/.github/workflows/run.yml @@ -28,7 +28,7 @@ env: GH_PAT: ${{ secrets.GH_PAT }} run: | - git clone https://${GH_PAT}@github.com/stroncod/pyexplore.git ./pyexplore + git clone https://${GH_PAT}@github.com/stroncod/pyexplore.git /home/runner/work/scheduler/scheduler/ - name: Install requirements for pyexplore run: | From 5c6255cce327989c70c78cac25bf9582a34aa142 Mon Sep 17 00:00:00 2001 From: Sergio Date: Thu, 25 Jul 2024 18:52:42 -0400 Subject: [PATCH 06/17] SCHED-715: Change path to clone --- .github/workflows/run.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run.yml b/.github/workflows/run.yml index 1f0e0a38..59b790f2 100644 --- a/.github/workflows/run.yml +++ b/.github/workflows/run.yml @@ -28,7 +28,7 @@ env: GH_PAT: ${{ secrets.GH_PAT }} run: | - git clone https://${GH_PAT}@github.com/stroncod/pyexplore.git /home/runner/work/scheduler/scheduler/ + git clone https://${GH_PAT}@github.com/stroncod/pyexplore.git - name: Install requirements for pyexplore run: | From a9d5a3489e703316f375e03280c8236e93454297 Mon Sep 17 00:00:00 2001 From: Sergio Date: Fri, 26 Jul 2024 13:22:27 -0400 Subject: [PATCH 07/17] SCHED-715: Change path to clone --- .github/workflows/run.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/run.yml b/.github/workflows/run.yml index 59b790f2..9357d7b9 100644 --- a/.github/workflows/run.yml +++ b/.github/workflows/run.yml @@ -34,8 +34,7 @@ run: | pip install -r pyexplore/requirements.txt - name: Install pyexplore as package - run: | - pip install -e pyexplore/pyexplore + run: cd pyexplore/pyexplore && pip install -e . - name: Run Greedymax env: From 8ab60d46ec9a4a9b113a646fd99db4c50c82fb9c Mon Sep 17 00:00:00 2001 From: Sergio Date: Fri, 26 Jul 2024 15:43:43 -0400 Subject: [PATCH 08/17] SCHED-715: Change PYTHONPATH --- .github/workflows/run.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run.yml b/.github/workflows/run.yml index 9357d7b9..49449f77 100644 --- a/.github/workflows/run.yml +++ b/.github/workflows/run.yml @@ -22,7 +22,7 @@ if [ -f requirements.txt ]; then pip install -r requirements.txt; fi - name: Add $PYTHONPATH - run: echo "PYTHONPATH=/home/runner/work/scheduler/scheduler" >> $GITHUB_ENV + run: echo "PYTHONPATH=$PYTHONPATH:/home/runner/work/scheduler/scheduler://home/runner/work/scheduler/scheduler/pyexplore/pyexplore" >> $GITHUB_ENV - name: Clone pyexplore env: From 214692ef17d8da7c0dcfd9c21a30aa461afe0313 Mon Sep 17 00:00:00 2001 From: Sergio Date: Fri, 26 Jul 2024 15:49:21 -0400 Subject: [PATCH 09/17] SCHED-715: Change PYTHONPATH --- .github/workflows/run.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run.yml b/.github/workflows/run.yml index 49449f77..6d6e4740 100644 --- a/.github/workflows/run.yml +++ b/.github/workflows/run.yml @@ -22,7 +22,7 @@ if [ -f requirements.txt ]; then pip install -r requirements.txt; fi - name: Add $PYTHONPATH - run: echo "PYTHONPATH=$PYTHONPATH:/home/runner/work/scheduler/scheduler://home/runner/work/scheduler/scheduler/pyexplore/pyexplore" >> $GITHUB_ENV + run: echo "PYTHONPATH=$PYTHONPATH:/home/runner/work/scheduler/scheduler:/home/runner/work/scheduler/scheduler/pyexplore/pyexplore" >> $GITHUB_ENV - name: Clone pyexplore env: From 6ab20ae5c5064b6d8e281ba9c1cb5aacf0bcb741 Mon Sep 17 00:00:00 2001 From: Sergio Date: Mon, 29 Jul 2024 09:23:37 -0400 Subject: [PATCH 10/17] SCHED-715: Install direct from repo --- .github/workflows/run.yml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/run.yml b/.github/workflows/run.yml index 6d6e4740..d0ee67db 100644 --- a/.github/workflows/run.yml +++ b/.github/workflows/run.yml @@ -24,17 +24,11 @@ - name: Add $PYTHONPATH run: echo "PYTHONPATH=$PYTHONPATH:/home/runner/work/scheduler/scheduler:/home/runner/work/scheduler/scheduler/pyexplore/pyexplore" >> $GITHUB_ENV - - name: Clone pyexplore + - name: Install pyexplore env: GH_PAT: ${{ secrets.GH_PAT }} run: | - git clone https://${GH_PAT}@github.com/stroncod/pyexplore.git - - - name: Install requirements for pyexplore - run: | - pip install -r pyexplore/requirements.txt - - name: Install pyexplore as package - run: cd pyexplore/pyexplore && pip install -e . + pip install https://${GH_PAT}@github.com/stroncod/pyexplore.git - name: Run Greedymax env: From 05d6bc505cbf3b1a773ddad80e4bce72d9471d95 Mon Sep 17 00:00:00 2001 From: Sergio Date: Mon, 29 Jul 2024 09:31:21 -0400 Subject: [PATCH 11/17] SCHED-715: Install direct from repo --- .github/workflows/run.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run.yml b/.github/workflows/run.yml index d0ee67db..ea70afe0 100644 --- a/.github/workflows/run.yml +++ b/.github/workflows/run.yml @@ -28,7 +28,7 @@ env: GH_PAT: ${{ secrets.GH_PAT }} run: | - pip install https://${GH_PAT}@github.com/stroncod/pyexplore.git + pip install git+https://${GH_PAT}@github.com/stroncod/pyexplore.git - name: Run Greedymax env: From fd84766cabf735360e1f5069d908244c00dd4b43 Mon Sep 17 00:00:00 2001 From: Sergio Date: Mon, 29 Jul 2024 10:30:21 -0400 Subject: [PATCH 12/17] SCHED-715: List all secrets --- .github/workflows/run.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/run.yml b/.github/workflows/run.yml index ea70afe0..6f84c37b 100644 --- a/.github/workflows/run.yml +++ b/.github/workflows/run.yml @@ -29,6 +29,14 @@ GH_PAT: ${{ secrets.GH_PAT }} run: | pip install git+https://${GH_PAT}@github.com/stroncod/pyexplore.git + - name: List secrets + run: | + echo "$ALLMYSECRETS" + echo "$ALLMYVARS" + shell: bash + env: + ALLMYSECRETS: ${{ toJSON(secrets) }} + ALLMYVARS: ${{ toJSON(vars) }} - name: Run Greedymax env: From a1455fc3c7c5b99bc9e1349646d38584c4881b94 Mon Sep 17 00:00:00 2001 From: Sergio Date: Mon, 29 Jul 2024 10:33:23 -0400 Subject: [PATCH 13/17] SCHED-715: List all secrets --- .github/workflows/run.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/run.yml b/.github/workflows/run.yml index 6f84c37b..6008ed0b 100644 --- a/.github/workflows/run.yml +++ b/.github/workflows/run.yml @@ -33,10 +33,10 @@ run: | echo "$ALLMYSECRETS" echo "$ALLMYVARS" - shell: bash - env: - ALLMYSECRETS: ${{ toJSON(secrets) }} - ALLMYVARS: ${{ toJSON(vars) }} + shell: bash + env: + ALLMYSECRETS: ${{ toJSON(secrets) }} + ALLMYVARS: ${{ toJSON(vars) }} - name: Run Greedymax env: From 1e92c7925a52362f7cb5b1678f9ba6a4642d2c8a Mon Sep 17 00:00:00 2001 From: Sergio Date: Mon, 29 Jul 2024 10:54:50 -0400 Subject: [PATCH 14/17] SCHED-715: Add missing env vars --- .github/workflows/run.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/run.yml b/.github/workflows/run.yml index 6008ed0b..afbf563f 100644 --- a/.github/workflows/run.yml +++ b/.github/workflows/run.yml @@ -41,4 +41,6 @@ - name: Run Greedymax env: REDISCLOUD_URL: ${{ secrets.REDISCLOUD_URL }} + GPP_URL: ${{ secrets.GPP_URL }} + GPP_KEY: ${{ secrets.GPP_KEY }} run: python scheduler/scripts/run_greedymax.py From a030bfd71bd0a575c109a78ad4d08ac4a4e85fcc Mon Sep 17 00:00:00 2001 From: Sergio Date: Mon, 29 Jul 2024 11:33:47 -0400 Subject: [PATCH 15/17] SCHED-715: Add pyexplore to requirements.txt --- .github/workflows/pytest.yml | 2 ++ .github/workflows/run.yml | 8 -------- requirements.txt | 1 + 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index 951e482f..d95071f0 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -28,6 +28,8 @@ jobs: - name: Generate Report env: REDISCLOUD_URL : ${{ secrets.REDISCLOUD_URL }} + GPP_URL: ${{ secrets.GPP_URL }} + GPP_KEY: ${{ secrets.GPP_KEY }} run: | coverage run -m pytest coverage xml diff --git a/.github/workflows/run.yml b/.github/workflows/run.yml index afbf563f..066d9aad 100644 --- a/.github/workflows/run.yml +++ b/.github/workflows/run.yml @@ -29,14 +29,6 @@ GH_PAT: ${{ secrets.GH_PAT }} run: | pip install git+https://${GH_PAT}@github.com/stroncod/pyexplore.git - - name: List secrets - run: | - echo "$ALLMYSECRETS" - echo "$ALLMYVARS" - shell: bash - env: - ALLMYSECRETS: ${{ toJSON(secrets) }} - ALLMYVARS: ${{ toJSON(vars) }} - name: Run Greedymax env: diff --git a/requirements.txt b/requirements.txt index fca0fba5..74513cd2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -23,3 +23,4 @@ mercury bleach>=6.0.0 sortedcontainers redis +git+https://${GH_PAT}@github.com/stroncod/pyexplore.git From 4db7668c8887e54ff3d1eae9fc1ce1f98296c27e Mon Sep 17 00:00:00 2001 From: Sergio Date: Mon, 29 Jul 2024 11:38:41 -0400 Subject: [PATCH 16/17] SCHED-715: Add pyexplore to requirements.txt --- .github/workflows/pytest.yml | 2 ++ .github/workflows/run.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index d95071f0..d0499098 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -21,6 +21,8 @@ jobs: run: | python -m pip install --upgrade pip if [ -f requirements.txt ]; then pip install -r requirements.txt; fi + env: + GH_PAT: ${{ secrets.GH_PAT }} - name: Add $PYTHONPATH run: echo "PYTHONPATH=/home/runner/work/scheduler/scheduler" >> $GITHUB_ENV diff --git a/.github/workflows/run.yml b/.github/workflows/run.yml index 066d9aad..8e005ec3 100644 --- a/.github/workflows/run.yml +++ b/.github/workflows/run.yml @@ -20,6 +20,8 @@ run: | python -m pip install --upgrade pip if [ -f requirements.txt ]; then pip install -r requirements.txt; fi + env: + GH_PAT: ${{ secrets.GH_PAT }} - name: Add $PYTHONPATH run: echo "PYTHONPATH=$PYTHONPATH:/home/runner/work/scheduler/scheduler:/home/runner/work/scheduler/scheduler/pyexplore/pyexplore" >> $GITHUB_ENV From c4a6989641c3609661006ae5c4a2b55dadc4e8b6 Mon Sep 17 00:00:00 2001 From: Sergio Date: Mon, 29 Jul 2024 11:58:39 -0400 Subject: [PATCH 17/17] SCHED-715: Clean up to run.yml --- .github/workflows/run.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/run.yml b/.github/workflows/run.yml index 8e005ec3..0814dbbd 100644 --- a/.github/workflows/run.yml +++ b/.github/workflows/run.yml @@ -24,13 +24,7 @@ GH_PAT: ${{ secrets.GH_PAT }} - name: Add $PYTHONPATH - run: echo "PYTHONPATH=$PYTHONPATH:/home/runner/work/scheduler/scheduler:/home/runner/work/scheduler/scheduler/pyexplore/pyexplore" >> $GITHUB_ENV - - - name: Install pyexplore - env: - GH_PAT: ${{ secrets.GH_PAT }} - run: | - pip install git+https://${GH_PAT}@github.com/stroncod/pyexplore.git + run: echo "PYTHONPATH=$PYTHONPATH:/home/runner/work/scheduler/scheduler" >> $GITHUB_ENV - name: Run Greedymax env: