adjust smoke_test workflow

cisagov · Jul 26, 2024 · ab36989 · ab36989
1 parent 31e7a4c
commit ab36989
Showing 1 changed file with 19 additions and 28 deletions.
diff --git a/.github/workflows/run_smoke_test.yml b/.github/workflows/run_smoke_test.yml
@@ -26,46 +26,37 @@ jobs:
       SCUBA_GITHUB_AUTOMATION_CREDS: ${{ secrets.SCUBA_GITHUB_AUTOMATION_CREDS }}
       GWS_SERVICE_ACCOUNT: ${{ secrets.GWS_SERVICE_ACCOUNT }}
     steps:
-      - name: Checkout repository 
         uses: actions/checkout@v4
+        uses: actions/setup-python@v5
+          with: 
+            python-version: "3.12"
 
-      - name: Run
+      - name: Install pytest
+        run: pip3 install pytest
+
+      - name: Setup virtualenv
         run: |
           pip3 install virtualenv
           python -m venv .venv
           .venv\Scripts\activate
 
+      - name: Check virtualenv creation
+        run: pytest ./Testing/Functional/SmokeTests/ -k "SmokeTest and test_venv_creation"
+
+      - name: Install dependencies
+        run: |
           python -m pip3 install .
           pip3 install -r requirements.txt
-          pip3 install pytest
 
-          python download_opa.py -v 0.60.0 -os windows
+      - name: Download OPA executable
+        run: python download_opa.py -v 0.60.0 -os windows
 
+      - name: Execute ScubaGoggles and check for correct output
+        run: |
+          echo "In step to execute ScubaGoggles smoke test" 
+          .venv\Scripts\activate
+          scubagoggles gws
           pytest -s ./Testing/Functional/SmokeTests/ --subjectemail="$env:GWS_SERVICE_ACCOUNT"
-
-      #- name: Setup virtualenv
-      #  run: |
-      #    pip3 install virtualenv
-      #    python -m venv .venv
-      #    .venv\Scripts\activate
-#
-      #- name: Check virtualenv creation
-      #  run: pytest ./Testing/Functional/SmokeTests/ -k "SmokeTest and test_venv_creation"
-#
-      #- name: Install dependencies
-      #  run: |
-      #    python -m pip3 install .
-      #    pip3 install -r requirements.txt
-#
-      #- name: Download OPA executable
-      #  run: python download_opa.py -v 0.60.0 -os windows
-#
-      #- name: Execute ScubaGoggles and check for correct output
-      #  run: |
-      #    echo "In step to execute ScubaGoggles smoke test" 
-      #    .venv\Scripts\activate
-      #    scubagoggles gws
-      #    pytest -s ./Testing/Functional/SmokeTests/ --subjectemail="$env:GWS_SERVICE_ACCOUNT"
       
       - name: Cache dependencies
         uses: actions/cache@v3