don't sleep if smoketest cancelled

openziti · Sep 1, 2023 · 6bc58c2 · 6bc58c2
1 parent 271d9da
commit 6bc58c2
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -206,13 +206,15 @@ jobs:
     runs-on: ubuntu-20.04
     needs: [ fablab-smoketest ]
     steps:
+      # allow time for investigation unless the smoketest succeeded or was skipped or the job was cancelled
       - name: Sleep If Failed
-        if: needs.fablab-smoketest.result != 'success' && needs.fablab-smoketest.result != 'skipped'
+        if: ! contains(fromJson('["success","skipped","cancelled"]'), needs.fablab-smoketest.result)
         run: |
           sleep 30m
 
+      # release cloud resources if the smoketest succeeded, failed, or was cancelled; unnecessary if skipped
       - name: Teardown Test Environment
-        if: always() && needs.fablab-smoketest.result != 'skipped'
+        if: needs.fablab-smoketest.result != 'skipped'
         env:
           FABLAB_PASSPHRASE: ${{ secrets.FABLAB_PASSPHRASE }}
         run: |