From 24986e14c20c51bd51cc4cbcb0bbbf11353284ac Mon Sep 17 00:00:00 2001 From: NiallTwomey2 Date: Mon, 7 Sep 2026 12:20:41 +0100 Subject: [PATCH 1/8] ci: run nightly e2e against release-1.10 Context: Nightly previously only tested on rhdh-adr:main. A branch matrix checks out each line and passes TARGET_BRANCH plus the matching image tag so release-1.10 is tested against that version's chart and operator. Fixes: RHDHBUGS-3560 --- .github/workflows/nightly.yaml | 63 ++++++++++++++++++++++++++++------ 1 file changed, 52 insertions(+), 11 deletions(-) diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml index bb33b4c0..26529604 100644 --- a/.github/workflows/nightly.yaml +++ b/.github/workflows/nightly.yaml @@ -10,16 +10,32 @@ permissions: jobs: e2e-tests: - name: Nightly E2E Tests + name: Nightly E2E Tests (${{ matrix.branch }}) runs-on: ubuntu-latest timeout-minutes: 30 - + strategy: + fail-fast: false + matrix: + branch: + - main + - release-1.10 steps: - name: Checkout repository uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 with: + ref: ${{ matrix.branch }} fetch-depth: 0 - + + - name: Set branch test variables + run: | + branch="${{ matrix.branch }}" + echo "TARGET_BRANCH=${branch}" >> "$GITHUB_ENV" + if [ "$branch" = "main" ]; then + echo "IMAGE_TAG=latest" >> "$GITHUB_ENV" + else + echo "IMAGE_TAG=latest-${branch#release-}" >> "$GITHUB_ENV" + fi + - name: Install dependencies run: | sudo apt-get update @@ -35,7 +51,12 @@ jobs: wait: 120s - name: Run E2E tests - run: make test-e2e LOCAL=false HELM_TIMEOUT=${{ vars.E2E_HELM_TIMEOUT || '25m' }} + run: > + make test-e2e + LOCAL=false + TARGET_BRANCH=${{ env.TARGET_BRANCH }} + IMAGE_TAG=${{ env.IMAGE_TAG }} + HELM_TIMEOUT=${{ vars.E2E_HELM_TIMEOUT || '25m' }} - name: Display must-gather process logs if: ${{ success() || failure() }} @@ -46,7 +67,7 @@ jobs: if: ${{ failure() }} uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7 with: - name: e2e-must-gather-output-nightly + name: e2e-must-gather-output-nightly-${{ matrix.branch }} path: e2e-cluster.mustgather.tar.gz retention-days: 7 @@ -54,7 +75,7 @@ jobs: if: ${{ success() || failure() }} uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7 with: - name: must-gather-output-nightly + name: must-gather-output-nightly-${{ matrix.branch }} path: | rhdh-must-gather-output.k8s.*.tar.gz rhdh-must-gather-output.k8s.*/ @@ -67,14 +88,28 @@ jobs: strategy: fail-fast: false matrix: + branch: + - main + - release-1.10 method: [auto, inspector, sigusr2] steps: - name: Checkout repository uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 with: + ref: ${{ matrix.branch }} fetch-depth: 0 + - name: Set branch test variables + run: | + branch="${{ matrix.branch }}" + echo "TARGET_BRANCH=${branch}" >> "$GITHUB_ENV" + if [ "$branch" = "main" ]; then + echo "IMAGE_TAG=latest" >> "$GITHUB_ENV" + else + echo "IMAGE_TAG=latest-${branch#release-}" >> "$GITHUB_ENV" + fi + - name: Install dependencies run: | sudo apt-get update @@ -92,10 +127,16 @@ jobs: - name: Run E2E tests with heap dumps (${{ matrix.method }} method) run: | if [ "${{ matrix.method }}" = "auto" ]; then - # Auto: let the tool use its built-in default method (inspector) - make test-e2e LOCAL=false WITH_HEAP_DUMPS=true HELM_TIMEOUT=${{ vars.E2E_HELM_TIMEOUT || '25m' }} + make test-e2e LOCAL=false WITH_HEAP_DUMPS=true \ + TARGET_BRANCH=${{ env.TARGET_BRANCH }} \ + IMAGE_TAG=${{ env.IMAGE_TAG }} \ + HELM_TIMEOUT=${{ vars.E2E_HELM_TIMEOUT || '25m' }} else - make test-e2e LOCAL=false WITH_HEAP_DUMPS=true HEAP_DUMP_METHOD=${{ matrix.method }} HELM_TIMEOUT=${{ vars.E2E_HELM_TIMEOUT || '25m' }} + make test-e2e LOCAL=false WITH_HEAP_DUMPS=true \ + HEAP_DUMP_METHOD=${{ matrix.method }} \ + TARGET_BRANCH=${{ env.TARGET_BRANCH }} \ + IMAGE_TAG=${{ env.IMAGE_TAG }} \ + HELM_TIMEOUT=${{ vars.E2E_HELM_TIMEOUT || '25m' }} fi - name: Display must-gather process logs @@ -107,7 +148,7 @@ jobs: if: ${{ failure() }} uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7 with: - name: e2e-must-gather-output-heap-dumps-${{ matrix.method }}-nightly + name: e2e-must-gather-output-heap-dumps-${{ matrix.method }}-${{ matrix.branch }}-nightly path: e2e-cluster.mustgather.tar.gz retention-days: 7 @@ -115,7 +156,7 @@ jobs: if: ${{ success() || failure() }} uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7 with: - name: must-gather-output-heap-dumps-${{ matrix.method }}-nightly + name: must-gather-output-heap-dumps-${{ matrix.branch }}-${{ matrix.method }}-nightly path: | rhdh-must-gather-output.k8s.*.tar.gz rhdh-must-gather-output.k8s.*/ From f1cddc6027326c587053dbdea3902b225795c3b1 Mon Sep 17 00:00:00 2001 From: Niall Twomey Date: Wed, 9 Sep 2026 19:57:13 +0100 Subject: [PATCH 2/8] Update .github/workflows/nightly.yaml Co-authored-by: Armel Soro --- .github/workflows/nightly.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml index 26529604..de8d486a 100644 --- a/.github/workflows/nightly.yaml +++ b/.github/workflows/nightly.yaml @@ -82,7 +82,7 @@ jobs: retention-days: 7 e2e-tests-heap-dumps: - name: Nightly E2E Tests (Heap Dumps - ${{ matrix.method }}) + name: Nightly E2E Tests Heap Dumps (${{ matrix.branch }} - ${{ matrix.method }}) runs-on: ubuntu-latest timeout-minutes: 30 strategy: From ef66be015c13b04b4cb9e3531796fbf07925e14a Mon Sep 17 00:00:00 2001 From: Niall Twomey Date: Wed, 9 Sep 2026 19:57:29 +0100 Subject: [PATCH 3/8] Update .github/workflows/nightly.yaml Co-authored-by: Armel Soro --- .github/workflows/nightly.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml index de8d486a..cea1b733 100644 --- a/.github/workflows/nightly.yaml +++ b/.github/workflows/nightly.yaml @@ -128,9 +128,9 @@ jobs: run: | if [ "${{ matrix.method }}" = "auto" ]; then make test-e2e LOCAL=false WITH_HEAP_DUMPS=true \ - TARGET_BRANCH=${{ env.TARGET_BRANCH }} \ - IMAGE_TAG=${{ env.IMAGE_TAG }} \ - HELM_TIMEOUT=${{ vars.E2E_HELM_TIMEOUT || '25m' }} + TARGET_BRANCH=${{ env.TARGET_BRANCH }} \ + IMAGE_TAG=${{ env.IMAGE_TAG }} \ + HELM_TIMEOUT=${{ vars.E2E_HELM_TIMEOUT || '25m' }} else make test-e2e LOCAL=false WITH_HEAP_DUMPS=true \ HEAP_DUMP_METHOD=${{ matrix.method }} \ From 8d9cd13a8e0474cd58bffb037880c30609ddc9d1 Mon Sep 17 00:00:00 2001 From: Niall Twomey Date: Wed, 9 Sep 2026 19:57:37 +0100 Subject: [PATCH 4/8] Update .github/workflows/nightly.yaml Co-authored-by: Armel Soro --- .github/workflows/nightly.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml index cea1b733..da9d9739 100644 --- a/.github/workflows/nightly.yaml +++ b/.github/workflows/nightly.yaml @@ -101,7 +101,7 @@ jobs: fetch-depth: 0 - name: Set branch test variables - run: | + run: | branch="${{ matrix.branch }}" echo "TARGET_BRANCH=${branch}" >> "$GITHUB_ENV" if [ "$branch" = "main" ]; then From e21d3abff10607ff80e496a510049df354890cb0 Mon Sep 17 00:00:00 2001 From: Niall Twomey Date: Wed, 9 Sep 2026 19:57:47 +0100 Subject: [PATCH 5/8] Update .github/workflows/nightly.yaml Co-authored-by: Armel Soro --- .github/workflows/nightly.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml index da9d9739..f6b4c07e 100644 --- a/.github/workflows/nightly.yaml +++ b/.github/workflows/nightly.yaml @@ -53,10 +53,10 @@ jobs: - name: Run E2E tests run: > make test-e2e - LOCAL=false - TARGET_BRANCH=${{ env.TARGET_BRANCH }} - IMAGE_TAG=${{ env.IMAGE_TAG }} - HELM_TIMEOUT=${{ vars.E2E_HELM_TIMEOUT || '25m' }} + LOCAL=false + TARGET_BRANCH=${{ env.TARGET_BRANCH }} + IMAGE_TAG=${{ env.IMAGE_TAG }} + HELM_TIMEOUT=${{ vars.E2E_HELM_TIMEOUT || '25m' }} - name: Display must-gather process logs if: ${{ success() || failure() }} From ece13bd2ff12a9f7017920d4ca07bdf15fab0015 Mon Sep 17 00:00:00 2001 From: Niall Twomey Date: Wed, 30 Sep 2026 15:31:08 +0100 Subject: [PATCH 6/8] Update .github/workflows/nightly.yaml Co-authored-by: Armel Soro --- .github/workflows/nightly.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml index f6b4c07e..3ea5094c 100644 --- a/.github/workflows/nightly.yaml +++ b/.github/workflows/nightly.yaml @@ -19,6 +19,7 @@ jobs: branch: - main - release-1.10 + - release-2.1 steps: - name: Checkout repository uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 From 72c484ca10ce2587758762c6f7ea2088c65c3541 Mon Sep 17 00:00:00 2001 From: Niall Twomey Date: Wed, 30 Sep 2026 15:31:18 +0100 Subject: [PATCH 7/8] Update .github/workflows/nightly.yaml Co-authored-by: Armel Soro --- .github/workflows/nightly.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml index 3ea5094c..fd7670d6 100644 --- a/.github/workflows/nightly.yaml +++ b/.github/workflows/nightly.yaml @@ -92,6 +92,7 @@ jobs: branch: - main - release-1.10 + - release-2.1 method: [auto, inspector, sigusr2] steps: From 626c53a05a6b8109e2db976c867ae8fa9cb14965 Mon Sep 17 00:00:00 2001 From: NiallTwomey2 Date: Mon, 5 Oct 2026 16:10:04 +0100 Subject: [PATCH 8/8] ci: drop unused nighly dispatch input and fix auto heap-dump make args --- .github/workflows/nightly.yaml | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml index 3a3ee79a..d72382de 100644 --- a/.github/workflows/nightly.yaml +++ b/.github/workflows/nightly.yaml @@ -4,10 +4,6 @@ on: schedule: - cron: '38 21 * * *' workflow_dispatch: - inputs: - target-branch: - description: 'Target branch for E2E tests (must exist in rhdh-chart and rhdh-operator repos)' - required: false permissions: contents: read @@ -32,10 +28,10 @@ jobs: fetch-depth: 0 - name: Set branch test variables - run: | + run: | branch="${{ matrix.branch }}" echo "TARGET_BRANCH=${branch}" >> "$GITHUB_ENV" - if [ "$branch" = "main" ]; then + if [ "$branch" = "main" ]; then echo "IMAGE_TAG=latest" >> "$GITHUB_ENV" else echo "IMAGE_TAG=latest-${branch#release-}" >> "$GITHUB_ENV" @@ -132,10 +128,11 @@ jobs: - name: Run E2E tests with heap dumps (${{ matrix.method }} method) run: | if [ "${{ matrix.method }}" = "auto" ]; then - make test-e2e LOCAL=false WITH_HEAP_DUMPS=true \ - TARGET_BRANCH="${{ env.TARGET_BRANCH }}" \ - IMAGE_TAG="${{ env.IMAGE_TAG }}" \ - HELM_TIMEOUT=${{ vars.E2E_HELM_TIMEOUT || '25m' }} + # Auto: let the tool use its built in default method (inspector) + make test-e2e LOCAL=false WITH_HEAP_DUMPS=true \ + TARGET_BRANCH="${{ env.TARGET_BRANCH }}" \ + IMAGE_TAG="${{ env.IMAGE_TAG }}" \ + HELM_TIMEOUT=${{ vars.E2E_HELM_TIMEOUT || '25m' }} else make test-e2e LOCAL=false WITH_HEAP_DUMPS=true \ HEAP_DUMP_METHOD="${{ matrix.method }}" \