From 1e4346670698f6cb86951578ba8d3d99e211e980 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 (cherry picked from commit 288693a622c7187f63b18198056d29357924e0e7) --- .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 fae09c7d5..4e8c5b92d 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: @@ -539,7 +539,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: @@ -599,7 +599,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: @@ -660,7 +660,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: @@ -727,7 +727,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: @@ -788,7 +788,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: @@ -855,7 +855,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: @@ -971,7 +971,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: @@ -1031,7 +1031,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: @@ -1103,7 +1103,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: @@ -1211,7 +1211,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: @@ -1273,7 +1273,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: @@ -1345,7 +1345,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: @@ -1443,7 +1443,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: @@ -1521,7 +1521,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: @@ -1587,7 +1587,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: @@ -1896,7 +1896,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 @@ -2007,7 +2007,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 @@ -2078,7 +2078,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: @@ -2111,7 +2111,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 }} @@ -2205,7 +2205,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 @@ -2271,7 +2271,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