move location of cache step; add shell=True to test

cisagov · Jul 25, 2024 · 8169f43 · 8169f43
1 parent 40ac102
commit 8169f43
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/.github/workflows/run_smoke_test.yml b/.github/workflows/run_smoke_test.yml
@@ -25,14 +25,6 @@ jobs:
     steps:
       - name: Checkout repository 
         uses: actions/checkout@v4
-
-      - name: Cache dependencies
-        uses: actions/cache@v3
-        with:
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
-          restore-keys: |
-            ${{ runner.os }}-pip-
 
       - name: Setup virtualenv
         run: |
@@ -53,4 +45,10 @@ jobs:
         run: |
           echo "In step to execute ScubaGoggles smoke test" 
           echo $env:GWS_SERVICE_ACCOUNT
-          pytest -s ./Testing/Functional/SmokeTests/ --subjectemail="$env:GWS_SERVICE_ACCOUNT"
+          pytest -s ./Testing/Functional/SmokeTests/ --subjectemail="$env:GWS_SERVICE_ACCOUNT"
+      
+      - name: Cache dependencies
+        uses: actions/cache@v3
+        with:
+          path: ~/.cache/pip
+          key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
diff --git a/Testing/Functional/SmokeTests/smoke_test.py b/Testing/Functional/SmokeTests/smoke_test.py
@@ -20,7 +20,7 @@ def test_venv_creation(self):
 
     def test_scubagoggles(self, subjectemail):
         command = f"scubagoggles gws --subjectemail {subjectemail} --quiet"
-        subprocess.run(command)
+        subprocess.run(command, shell=True)
 
         prefix = "GWSBaselineConformance"
         directories = [d for d in os.listdir() if os.path.isdir(d) and d.startswith(prefix)]