Skip to content

Commit

Permalink
Fix failing systest job not blocking merge (#6658)
Browse files Browse the repository at this point in the history
## Motivation

My previous change in #6626 broke `bors merge` to block merging a PR when system tests fail and instead always merged. This should fix this problem.
  • Loading branch information
fasmat committed Jan 22, 2025
1 parent 9e4ea63 commit 8595fcc
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/systest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,6 @@ jobs:
systest-gke:
runs-on: ubuntu-22.04
if: ${{ needs.filter-changes.outputs.nondocchanges == 'true' }}
continue-on-error: true
needs:
- filter-changes
- provision-cluster
Expand Down Expand Up @@ -262,9 +261,10 @@ jobs:

delete-pool:
runs-on: ubuntu-22.04
if: ${{ needs.filter-changes.outputs.nondocchanges == 'true' }}
if: ${{ always() && needs.provision-cluster.result == 'success' }}
needs:
- filter-changes
- provision-cluster
- systest-gke
timeout-minutes: 20
permissions:
Expand Down

0 comments on commit 8595fcc

Please sign in to comment.