From df7ade3d02605668591aed354d73ce68f7277669 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20St=C3=A4bler?= Date: Wed, 29 Apr 2026 13:12:46 +0200 Subject: [PATCH 1/3] Reduce e2e test matrix on PRs to 3 priority combos Run only priority builder/deployer combinations on pull requests to reduce runner wait times. The full 6-combo matrix still runs on merge queue and release branch pushes. --- .github/workflows/test-e2e.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml index 497dd86..1ac9032 100644 --- a/.github/workflows/test-e2e.yml +++ b/.github/workflows/test-e2e.yml @@ -15,11 +15,18 @@ jobs: test-e2e: name: E2E Tests (${{ matrix.builder }}/${{ matrix.deployer }}) runs-on: ubuntu-latest + # On PRs only priority combos run; merge queue and push run all 6 + if: matrix.priority || github.event_name != 'pull_request' strategy: fail-fast: false matrix: - builder: [pack, s2i] - deployer: [knative, raw, keda] + include: + - { builder: pack, deployer: knative, priority: true } + - { builder: pack, deployer: keda, priority: true } + - { builder: pack, deployer: raw, priority: false } + - { builder: s2i, deployer: knative, priority: true } + - { builder: s2i, deployer: keda, priority: false } + - { builder: s2i, deployer: raw, priority: true } steps: - name: Free up disk space run: | From 103cdfa80d12678c2044328b3a003d4418b8a633 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20St=C3=A4bler?= Date: Wed, 29 Apr 2026 14:59:14 +0200 Subject: [PATCH 2/3] Use base matrix as default --- .github/workflows/test-e2e.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml index 1ac9032..5985171 100644 --- a/.github/workflows/test-e2e.yml +++ b/.github/workflows/test-e2e.yml @@ -20,13 +20,13 @@ jobs: strategy: fail-fast: false matrix: + builder: [ pack, s2i ] + deployer: [ knative, raw, keda ] include: - - { builder: pack, deployer: knative, priority: true } - - { builder: pack, deployer: keda, priority: true } - - { builder: pack, deployer: raw, priority: false } - - { builder: s2i, deployer: knative, priority: true } - - { builder: s2i, deployer: keda, priority: false } - - { builder: s2i, deployer: raw, priority: true } + - { deployer: knative, priority: true } # run always the knative tests, as they cover the full suite + # one keda & one raw deployer test on different builders + - { builder: pack, deployer: keda, priority: true } + - { builder: s2i, deployer: raw, priority: true } steps: - name: Free up disk space run: | From 8f172cc941373096279cf3acfce076c7ec9d3f03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20St=C3=A4bler?= Date: Wed, 29 Apr 2026 15:03:51 +0200 Subject: [PATCH 3/3] use exclude --- .github/workflows/test-e2e.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml index 5985171..bd004aa 100644 --- a/.github/workflows/test-e2e.yml +++ b/.github/workflows/test-e2e.yml @@ -15,18 +15,18 @@ jobs: test-e2e: name: E2E Tests (${{ matrix.builder }}/${{ matrix.deployer }}) runs-on: ubuntu-latest - # On PRs only priority combos run; merge queue and push run all 6 - if: matrix.priority || github.event_name != 'pull_request' strategy: fail-fast: false matrix: builder: [ pack, s2i ] deployer: [ knative, raw, keda ] - include: - - { deployer: knative, priority: true } # run always the knative tests, as they cover the full suite - # one keda & one raw deployer test on different builders - - { builder: pack, deployer: keda, priority: true } - - { builder: s2i, deployer: raw, priority: true } + exclude: + - builder: pack, + deployer: keda + if: ${{ github.event_name == 'pull_request' }} + - builder: s2i + deployer: raw + if: ${{ github.event_name == 'pull_request' }} steps: - name: Free up disk space run: |