Merge pull request #539 from ngrok/hkatz/e2e-prep-2

Enable deny gate for 'safe to test' label
ngrok · Dec 4, 2024 · 5b03e07 · 5b03e07
2 parents 39597eb + c68faf4
commit 5b03e07
Showing 1 changed file with 15 additions and 15 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -37,26 +37,26 @@ jobs:
     runs-on: ubuntu-latest
     needs:
     - changes
-    # Runs If
-    # - commit is pushed to main on ngrok/ngrok-operator repo (i.e. the PR is merged)
-    # - PR contains the label 'safe to test' and changes to go code, charts, chartyaml, tests, or makefile
     if: |
-      (github.event_name == 'push' && github.ref_name == 'main')
-      ||
-      (
-        contains(github.event.pull_request.labels.*.name, 'safe to test')
-        && (
-          (needs.changes.outputs.go == 'true') ||
-          (needs.changes.outputs.charts == 'true') ||
-          (needs.changes.outputs.chartyaml == 'true') ||
-          (needs.changes.outputs.tests == 'true') ||
-          (needs.changes.outputs.make == 'true')
-        )
-      )
+      (needs.changes.outputs.go == 'true') ||
+      (needs.changes.outputs.charts == 'true') ||
+      (needs.changes.outputs.chartyaml == 'true') ||
+      (needs.changes.outputs.tests == 'true') ||
+      (needs.changes.outputs.make == 'true')
     permissions:
       contents: read
       pull-requests: read
     steps:
+    - name: Confirm 'safe to test'
+      # PRs from forks must be labeled 'safe to test' to run e2e tests
+      # Merges to main are tested automatically
+      if: |
+        !(github.event_name == 'push' && github.ref_name == 'main')
+        &&
+        !(contains(github.event.pull_request.labels.*.name, 'safe to test'))
+      run: |
+        echo 'This PR is not labeled "safe to test", blocking e2e tests...'
+        exit 1 # intentionally fail the job
     # checkout the repo at the PR's head sha (inside the fork's commits)
     # this allows forks to test changes to the go code and e2e tests
     - uses: actions/checkout@v3