retry conditionals

cisagov · Jul 30, 2024 · a3fbd70 · a3fbd70
1 parent 8bc89a2
commit a3fbd70
Showing 1 changed file with 32 additions and 36 deletions.
diff --git a/.github/workflows/run_smoke_test.yml b/.github/workflows/run_smoke_test.yml
@@ -37,44 +37,40 @@ jobs:
           python-version: ${{ matrix.python }}
           cache-dependency-path: "requirements.txt"
 
-      - name: Setup and Run ScubaGoggles
-        uses: ./.github/workflows/run_scubagoggles
-        with: 
-          os: ${{ matrix.os }}
+      - name: Setup Windows dependencies
+        if: matrix.os = "windows-latest"
+        uses: ./.github/actions/setup-windows-dependencies
+        with:
+          operating-system: "windows"
           opa-version: "0.60.0"
 
-      #- name: Setup Windows dependencies
-      #  uses: ./.github/actions/setup-windows-dependencies
-      #  with:
-      #    operating-system: "windows"
-      #    opa-version: "0.60.0"
-      #
-      #- name: Setup macOS dependencies
-      #  uses: ./.github/actions/setup-windows-dependencies
-      #  with:
-      #    operating-system: "macos"
-      #    opa-version: "0.60.0"
-#
-      #- name: Execute ScubaGoggles and check for correct output
-      #  if: ${{ matrix.os == "windows-latest" }} 
-      #  run: |
-      #    # Setup credentials for service account
-      #    Set-Content -Path credentials.json -Value $env:GWS_GITHUB_AUTOMATION_CREDS
-      #    pytest -s ./Testing/Functional/SmokeTests/ --subjectemail="$env:GWS_SUBJECT_EMAIL"
-      #
-      #- name: Execute ScubaGoggles and check for correct output
-      #  if: ${{ matrix.os == "macos-latest" }} 
-      #  run: |
-      #    echo "in second step"
-      #    
-      #    # Give OPA executable execute permissions
-      #    chmod +x opa_darwin_amd64
-#
-      #    # Setup credentials for service account
-      #    echo $env:GWS_GITHUB_AUTOMATION_CREDS
-      #    echo $env:GWS_GITHUB_AUTOMATION_CREDS >> credentials.json
-      #    cat credentials.json
-      #    #pytest -s ./Testing/Functional/SmokeTests/ --subjectemail="$env:GWS_SUBJECT_EMAIL"
+      - name: Setup macOS dependencies
+        if: matrix.os = "mac-latest"
+        uses: ./.github/actions/setup-windows-dependencies
+        with:
+          operating-system: "macos"
+          opa-version: "0.60.0"
+
+      - name: Execute ScubaGoggles and check for correct output
+        if: matrix.os = "windows-latest"
+        run: |
+          # Setup credentials for service account
+          Set-Content -Path credentials.json -Value $env:GWS_GITHUB_AUTOMATION_CREDS
+          pytest -s ./Testing/Functional/SmokeTests/ --subjectemail="$env:GWS_SUBJECT_EMAIL"
+      
+      - name: Execute ScubaGoggles and check for correct output
+        if: matrix.os == "macos-latest" 
+        run: |
+          echo "in second step"
+          
+          # Give OPA executable execute permissions
+          chmod +x opa_darwin_amd64
+
+          # Setup credentials for service account
+          echo $env:GWS_GITHUB_AUTOMATION_CREDS
+          echo $env:GWS_GITHUB_AUTOMATION_CREDS >> credentials.json
+          cat credentials.json
+          #pytest -s ./Testing/Functional/SmokeTests/ --subjectemail="$env:GWS_SUBJECT_EMAIL"
 
   #smoke-test-windows:
   #  if: false