From 288693a622c7187f63b18198056d29357924e0e7 Mon Sep 17 00:00:00 2001 From: Joshua Hoblitt Date: Fri, 12 Jun 2026 20:54:50 -0700 Subject: [PATCH] ci: include kubernetes version in canary artifact names Canary jobs upload their logs under an artifact named by job and ceph image, but the job matrix also varies kubernetes-version. When more than one kubernetes version is exercised the upload-artifact step fails on a duplicate artifact name. Append the kubernetes version so each matrix cell produces a unique artifact. Signed-off-by: Joshua Hoblitt --- .github/workflows/canary-integration-test.yml | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/workflows/canary-integration-test.yml b/.github/workflows/canary-integration-test.yml index c07145f20..25e5d633a 100644 --- a/.github/workflows/canary-integration-test.yml +++ b/.github/workflows/canary-integration-test.yml @@ -452,7 +452,7 @@ jobs: if: always() uses: ./.github/workflows/collect-logs with: - name: ${{ github.job }}-${{ matrix.ceph-image }} + name: ${{ github.job }}-${{ matrix.ceph-image }}-${{ matrix.kubernetes-version }} - name: consider (post-job) debugging uses: ./.github/workflows/upterm_debug with: @@ -538,7 +538,7 @@ jobs: if: always() uses: ./.github/workflows/collect-logs with: - name: ${{ github.job }}-${{ matrix.ceph-image }} + name: ${{ github.job }}-${{ matrix.ceph-image }}-${{ matrix.kubernetes-version }} - name: consider (post-job) debugging uses: ./.github/workflows/upterm_debug with: @@ -597,7 +597,7 @@ jobs: if: always() uses: ./.github/workflows/collect-logs with: - name: ${{ github.job }}-${{ matrix.ceph-image }} + name: ${{ github.job }}-${{ matrix.ceph-image }}-${{ matrix.kubernetes-version }} - name: consider (post-job) debugging uses: ./.github/workflows/upterm_debug with: @@ -657,7 +657,7 @@ jobs: if: always() uses: ./.github/workflows/collect-logs with: - name: ${{ github.job }}-${{ matrix.ceph-image }} + name: ${{ github.job }}-${{ matrix.ceph-image }}-${{ matrix.kubernetes-version }} - name: consider (post-job) debugging uses: ./.github/workflows/upterm_debug with: @@ -723,7 +723,7 @@ jobs: if: always() uses: ./.github/workflows/collect-logs with: - name: ${{ github.job }}-${{ matrix.ceph-image }} + name: ${{ github.job }}-${{ matrix.ceph-image }}-${{ matrix.kubernetes-version }} - name: consider (post-job) debugging uses: ./.github/workflows/upterm_debug with: @@ -783,7 +783,7 @@ jobs: if: always() uses: ./.github/workflows/collect-logs with: - name: ${{ github.job }}-${{ matrix.ceph-image }} + name: ${{ github.job }}-${{ matrix.ceph-image }}-${{ matrix.kubernetes-version }} - name: consider (post-job) debugging uses: ./.github/workflows/upterm_debug with: @@ -848,7 +848,7 @@ jobs: if: always() uses: ./.github/workflows/collect-logs with: - name: ${{ github.job }}-${{ matrix.ceph-image }} + name: ${{ github.job }}-${{ matrix.ceph-image }}-${{ matrix.kubernetes-version }} - name: consider (post-job) debugging uses: ./.github/workflows/upterm_debug with: @@ -960,7 +960,7 @@ jobs: if: always() uses: ./.github/workflows/collect-logs with: - name: ${{ github.job }}-${{ matrix.ceph-image }} + name: ${{ github.job }}-${{ matrix.ceph-image }}-${{ matrix.kubernetes-version }} - name: consider (post-job) debugging uses: ./.github/workflows/upterm_debug with: @@ -1020,7 +1020,7 @@ jobs: if: always() uses: ./.github/workflows/collect-logs with: - name: ${{ github.job }}-${{ matrix.ceph-image }} + name: ${{ github.job }}-${{ matrix.ceph-image }}-${{ matrix.kubernetes-version }} - name: consider (post-job) debugging uses: ./.github/workflows/upterm_debug with: @@ -1091,7 +1091,7 @@ jobs: if: always() uses: ./.github/workflows/collect-logs with: - name: ${{ github.job }}-${{ matrix.ceph-image }} + name: ${{ github.job }}-${{ matrix.ceph-image }}-${{ matrix.kubernetes-version }} - name: consider (post-job) debugging uses: ./.github/workflows/upterm_debug with: @@ -1195,7 +1195,7 @@ jobs: if: always() uses: ./.github/workflows/collect-logs with: - name: ${{ github.job }}-${{ matrix.ceph-image }} + name: ${{ github.job }}-${{ matrix.ceph-image }}-${{ matrix.kubernetes-version }} - name: consider (post-job) debugging uses: ./.github/workflows/upterm_debug with: @@ -1257,7 +1257,7 @@ jobs: if: always() uses: ./.github/workflows/collect-logs with: - name: ${{ github.job }}-${{ matrix.ceph-image }} + name: ${{ github.job }}-${{ matrix.ceph-image }}-${{ matrix.kubernetes-version }} - name: consider (post-job) debugging uses: ./.github/workflows/upterm_debug with: @@ -1329,7 +1329,7 @@ jobs: if: always() uses: ./.github/workflows/collect-logs with: - name: ${{ github.job }}-${{ matrix.ceph-image }} + name: ${{ github.job }}-${{ matrix.ceph-image }}-${{ matrix.kubernetes-version }} - name: consider (post-job) debugging uses: ./.github/workflows/upterm_debug with: @@ -1426,7 +1426,7 @@ jobs: if: always() uses: ./.github/workflows/collect-logs with: - name: ${{ github.job }}-${{ matrix.ceph-image }} + name: ${{ github.job }}-${{ matrix.ceph-image }}-${{ matrix.kubernetes-version }} - name: consider (post-job) debugging uses: ./.github/workflows/upterm_debug with: @@ -1503,7 +1503,7 @@ jobs: if: always() uses: ./.github/workflows/collect-logs with: - name: ${{ github.job }}-${{ matrix.ceph-image }} + name: ${{ github.job }}-${{ matrix.ceph-image }}-${{ matrix.kubernetes-version }} - name: consider (post-job) debugging uses: ./.github/workflows/upterm_debug with: @@ -1568,7 +1568,7 @@ jobs: if: always() uses: ./.github/workflows/collect-logs with: - name: ${{ github.job }}-${{ matrix.ceph-image }} + name: ${{ github.job }}-${{ matrix.ceph-image }}-${{ matrix.kubernetes-version }} - name: consider (post-job) debugging uses: ./.github/workflows/upterm_debug with: @@ -1858,7 +1858,7 @@ jobs: if: always() uses: ./.github/workflows/collect-logs with: - name: ${{ github.job }}-${{ matrix.ceph-image }} + name: ${{ github.job }}-${{ matrix.ceph-image }}-${{ matrix.kubernetes-version }} additional-namespace: rook-ceph-secondary - name: consider (post-job) debugging uses: ./.github/workflows/upterm_debug @@ -1968,7 +1968,7 @@ jobs: if: always() uses: ./.github/workflows/collect-logs with: - name: ${{ github.job }}-${{ matrix.ceph-image }} + name: ${{ github.job }}-${{ matrix.ceph-image }}-${{ matrix.kubernetes-version }} additional-namespace: rook-ceph-secondary - name: consider (post-job) debugging uses: ./.github/workflows/upterm_debug @@ -2038,7 +2038,7 @@ jobs: if: always() uses: ./.github/workflows/collect-logs with: - name: ${{ github.job }}-${{ matrix.ceph-image }} + name: ${{ github.job }}-${{ matrix.ceph-image }}-${{ matrix.kubernetes-version }} - name: consider (post-job) debugging uses: ./.github/workflows/upterm_debug with: @@ -2071,7 +2071,7 @@ jobs: with: ibm-instance-id: ${{ secrets.IBM_INSTANCE_ID }} ibm-service-api-key: ${{ secrets.IBM_SERVICE_API_KEY }} - artifact-name: ${{ github.job }}-${{ matrix.ceph-image }} + artifact-name: ${{ github.job }}-${{ matrix.ceph-image }}-${{ matrix.kubernetes-version }} ceph-image: ${{ matrix.ceph-image }} kubernetes-version: ${{ matrix.kubernetes-version }} @@ -2164,7 +2164,7 @@ jobs: if: always() uses: ./.github/workflows/collect-logs with: - name: ${{ github.job }}-${{ matrix.ceph-image }} + name: ${{ github.job }}-${{ matrix.ceph-image }}-${{ matrix.kubernetes-version }} additional-namespace: kube-system - name: consider (post-job) debugging uses: ./.github/workflows/upterm_debug @@ -2230,7 +2230,7 @@ jobs: if: always() uses: ./.github/workflows/collect-logs with: - name: ${{ github.job }}-${{ matrix.ceph-image }} + name: ${{ github.job }}-${{ matrix.ceph-image }}-${{ matrix.kubernetes-version }} - name: consider (post-job) debugging uses: ./.github/workflows/upterm_debug