From 13bc04047ef8db09d4588ea43203c94a48904a0c Mon Sep 17 00:00:00 2001 From: Marie <51697796+ijreilly@users.noreply.github.com> Date: Tue, 6 Jan 2026 15:56:39 +0100 Subject: [PATCH] [E2E tests] Fix run E2E tests before merge - attempt #3 (#16961) --- .github/workflows/ci-front.yaml | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/.github/workflows/ci-front.yaml b/.github/workflows/ci-front.yaml index 98c3bcb2796..a3ee43fe6fd 100644 --- a/.github/workflows/ci-front.yaml +++ b/.github/workflows/ci-front.yaml @@ -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