[E2E tests] Fix run E2E tests before merge - attempt #3 (#16961)

This commit is contained in:
Marie
2026-01-06 15:56:39 +01:00
committed by GitHub
parent 96f7f1cb0e
commit 13bc04047e
+1 -12
View File
@@ -351,7 +351,7 @@ jobs:
if: contains(needs.*.result, 'failure')
run: exit 1
ci-e2e-status-check:
if: always() && !cancelled() && github.event_name != 'merge_group'
if: always() && !cancelled()
timeout-minutes: 5
runs-on: ubuntu-latest
needs: [changed-files-check-e2e, e2e-test]
@@ -359,14 +359,3 @@ jobs:
- name: Fail job if any needs failed
if: contains(needs.*.result, 'failure')
run: exit 1
ci-e2e-merge-queue-check:
if: |
always() && !cancelled() && github.event_name == 'merge_group'
timeout-minutes: 5
runs-on: ubuntu-latest
name: ${{ github.event_name == 'merge_group' && 'ci-e2e-merge-queue-check' || 'ci-e2e-status-check' }}
needs: [changed-files-check-e2e, e2e-test]
steps:
- name: Fail job if any needs failed
if: contains(needs.*.result, 'failure')
run: exit 1