[CI] fix the ORCHESTRA_DEPLOYMENT_TYPE env variable set to wrong value

OpenMined · Sep 30, 2024 · 6cdd3d6 · 6cdd3d6
1 parent 40c9387
commit 6cdd3d6
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 7 deletions.
diff --git a/.github/workflows/pr-tests-stack.yml b/.github/workflows/pr-tests-stack.yml
@@ -1055,8 +1055,6 @@ jobs:
       - name: Run scenario tests
         if: steps.changes.outputs.syft == 'true'  || steps.changes.outputs.notebooks_scenario == 'true'
         env:
-          ORCHESTRA_DEPLOYMENT_TYPE: "${{ matrix.deployment-type }}"
-          BUMP_VERSION: "${{ matrix.bump-version }}"
           TOX_PYTHON: python${{ matrix.python-version }}
         shell: bash
         run: |
@@ -1181,7 +1179,6 @@ jobs:
       - name: Run scenario tests
         if: steps.changes.outputs.syft == 'true'  || steps.changes.outputs.notebooks_scenario == 'true'
         env:
-          ORCHESTRA_DEPLOYMENT_TYPE: "${{ matrix.deployment-type }}"
           BUMP_VERSION: "${{ matrix.bump-version }}"
           TOX_PYTHON: python${{ matrix.python-version }}
         shell: bash

diff --git a/notebooks/api/0.8/11-container-images-k8s.ipynb b/notebooks/api/0.8/11-container-images-k8s.ipynb
@@ -1394,6 +1394,11 @@
   }
  ],
  "metadata": {
+  "kernelspec": {
+   "display_name": "Python 3 (ipykernel)",
+   "language": "python",
+   "name": "python3"
+  },
   "language_info": {
    "codemirror_mode": {
     "name": "ipython",
@@ -1404,7 +1409,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.12.5"
+   "version": "3.12.2"
   }
  },
  "nbformat": 4,

diff --git a/notebooks/tutorials/version-upgrades/0-prepare-migration-data.ipynb b/notebooks/tutorials/version-upgrades/0-prepare-migration-data.ipynb
@@ -251,7 +251,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.13"
+   "version": "3.12.2"
   }
  },
  "nbformat": 4,

diff --git a/notebooks/tutorials/version-upgrades/1-dump-database-to-file.ipynb b/notebooks/tutorials/version-upgrades/1-dump-database-to-file.ipynb
@@ -144,7 +144,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.13"
+   "version": "3.12.2"
   }
  },
  "nbformat": 4,

diff --git a/notebooks/tutorials/version-upgrades/2-migrate-from-file.ipynb b/notebooks/tutorials/version-upgrades/2-migrate-from-file.ipynb
@@ -309,7 +309,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.13"
+   "version": "3.12.2"
   }
  },
  "nbformat": 4,

diff --git a/tox.ini b/tox.ini
@@ -21,6 +21,7 @@ envlist =
     syft.test.security
     syft.test.unit
     syft.test.scenario
+    syft.test.scenario.sync
     syft.test.notebook
     syft.test.notebook.scenario
     syft.test.notebook.scenario.sync
@@ -293,6 +294,32 @@ commands =
     bash -c 'ulimit -n 4096 || true'
     pytest -n auto --dist loadgroup --durations=20 --disable-warnings
 
+[testenv:syft.test.scenario]
+description = BigQuery Scenario Tests on Python Servers (L2)
+changedir = {toxinidir}
+deps =
+    {[testenv:syft]deps}
+    pytest-asyncio
+    pytest-timeout
+allowlist_externals =
+    bash
+    pytest
+commands =
+    bash -c "pytest -s --disable-warnings tests/scenariosv2/l2_test.py"
+
+[testenv:syft.test.scenario.sync]
+description = BigQuery Scenario Tests on Python Servers (L0)
+changedir = {toxinidir}
+deps =
+    {[testenv:syft]deps}
+    pytest-asyncio
+    pytest-timeout
+allowlist_externals =
+    bash
+    pytest
+commands =
+    bash -c "pytest -s --disable-warnings tests/scenariosv2/l0_test.py"
+
 [testenv:stack.test.scenario.k8s]
 description = BigQuery Scenario Tests on K8s (L2)
 changedir = {toxinidir}
@@ -309,6 +336,7 @@ allowlist_externals =
 commands_pre =
     just delete-all start-high deploy-high wait-high
 commands =
+    bash -c "echo Running BigQuery Scenario Tests on K8s (L2) with ORCHESTRA_DEPLOYMENT_TYPE=$ORCHESTRA_DEPLOYMENT_TYPE"
     bash -c "pytest -s --disable-warnings tests/scenariosv2/l2_test.py"
 commands_post =
     just delete-all
@@ -330,6 +358,7 @@ commands_pre =
     just delete-all start-high deploy-high wait-high
     just start-low deploy-low wait-low
 commands =
+    bash -c "echo Running BigQuery Scenario Tests on K8s (L0) with ORCHESTRA_DEPLOYMENT_TYPE=$ORCHESTRA_DEPLOYMENT_TYPE"
     bash -c "pytest -s --disable-warnings tests/scenariosv2/l0_test.py"
 commands_post =
     just delete-all