From eea92c167c1dbe9236957baf1331925e1983ba20 Mon Sep 17 00:00:00 2001
From: stevenhorsman <steven@uk.ibm.com>
Date: Fri, 6 Mar 2026 15:00:15 +0000
Subject: [PATCH] workflow: Add group-suffix where needed

When reusable workflows are called, the workflow seems to be
transferred from the caller, so we need to differentiate by adding
a suffix unique to these workflows

Signed-off-by: stevenhorsman <steven@uk.ibm.com>
---
 .github/workflows/basic-ci-amd64.yaml               |  2 +-
 .../workflows/build-kata-static-tarball-amd64.yaml  |  2 +-
 .../workflows/build-kata-static-tarball-s390x.yaml  |  2 +-
 .github/workflows/build-kubectl-image.yaml          |  2 +-
 .github/workflows/cargo-deny-runner.yaml            |  2 +-
 .github/workflows/ci-coco-stability.yaml            |  2 +-
 .github/workflows/ci-nightly-s390x.yaml             |  2 +-
 .github/workflows/ci-nightly.yaml                   |  2 +-
 .github/workflows/ci-on-push.yaml                   |  2 +-
 .github/workflows/ci-weekly.yaml                    |  2 +-
 .github/workflows/ci.yaml                           |  2 +-
 .github/workflows/gatekeeper-skipper.yaml           |  2 +-
 .github/workflows/publish-kata-deploy-payload.yaml  |  2 +-
 .github/workflows/run-cri-containerd-tests.yaml     | 13 +++++++------
 .github/workflows/run-metrics.yaml                  |  2 +-
 15 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/basic-ci-amd64.yaml b/.github/workflows/basic-ci-amd64.yaml
index b62cbeb9ea..f0094a44d0 100644
--- a/.github/workflows/basic-ci-amd64.yaml
+++ b/.github/workflows/basic-ci-amd64.yaml
@@ -16,7 +16,7 @@ on:
 permissions: {}
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-amd64
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-basic-amd64
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/build-kata-static-tarball-amd64.yaml b/.github/workflows/build-kata-static-tarball-amd64.yaml
index 75c86bf96f..0e0bb0e0a0 100644
--- a/.github/workflows/build-kata-static-tarball-amd64.yaml
+++ b/.github/workflows/build-kata-static-tarball-amd64.yaml
@@ -29,7 +29,7 @@ on:
 permissions: {}
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-amd64
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-tarball-amd64
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/build-kata-static-tarball-s390x.yaml b/.github/workflows/build-kata-static-tarball-s390x.yaml
index 6686df177a..4a5cc99770 100644
--- a/.github/workflows/build-kata-static-tarball-s390x.yaml
+++ b/.github/workflows/build-kata-static-tarball-s390x.yaml
@@ -30,7 +30,7 @@ on:
 permissions: {}
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-s390x
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-tarball-s390x
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/build-kubectl-image.yaml b/.github/workflows/build-kubectl-image.yaml
index 69417951b8..5e8e1553e6 100644
--- a/.github/workflows/build-kubectl-image.yaml
+++ b/.github/workflows/build-kubectl-image.yaml
@@ -16,7 +16,7 @@ on:
 permissions: {}
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-kubectl-image
   cancel-in-progress: true
 
 env:
diff --git a/.github/workflows/cargo-deny-runner.yaml b/.github/workflows/cargo-deny-runner.yaml
index bf704eac9a..67bdf59cfd 100644
--- a/.github/workflows/cargo-deny-runner.yaml
+++ b/.github/workflows/cargo-deny-runner.yaml
@@ -8,7 +8,7 @@ on:
       - synchronize
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-cargo-deny
   cancel-in-progress: true
 
 permissions: {}
diff --git a/.github/workflows/ci-coco-stability.yaml b/.github/workflows/ci-coco-stability.yaml
index 3a75d91349..1bb7065b6c 100644
--- a/.github/workflows/ci-coco-stability.yaml
+++ b/.github/workflows/ci-coco-stability.yaml
@@ -6,7 +6,7 @@ on:
   workflow_dispatch:
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-coco-stability
   cancel-in-progress: true
 
 permissions: {}
diff --git a/.github/workflows/ci-nightly-s390x.yaml b/.github/workflows/ci-nightly-s390x.yaml
index 8504d476ef..33d656ceb2 100644
--- a/.github/workflows/ci-nightly-s390x.yaml
+++ b/.github/workflows/ci-nightly-s390x.yaml
@@ -7,7 +7,7 @@ name: Nightly CI for s390x
 permissions: {}
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-nightly-s390x
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/ci-nightly.yaml b/.github/workflows/ci-nightly.yaml
index 57ccd74f85..0f33523b53 100644
--- a/.github/workflows/ci-nightly.yaml
+++ b/.github/workflows/ci-nightly.yaml
@@ -4,7 +4,7 @@ on:
     - cron: '0 0 * * *'
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-nightly
   cancel-in-progress: true
 
 permissions: {}
diff --git a/.github/workflows/ci-on-push.yaml b/.github/workflows/ci-on-push.yaml
index e9ca81a0b4..1cd8a13632 100644
--- a/.github/workflows/ci-on-push.yaml
+++ b/.github/workflows/ci-on-push.yaml
@@ -16,7 +16,7 @@ on:
 permissions: {}
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-on-push
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/ci-weekly.yaml b/.github/workflows/ci-weekly.yaml
index d4ca4515cc..1bd191e8c9 100644
--- a/.github/workflows/ci-weekly.yaml
+++ b/.github/workflows/ci-weekly.yaml
@@ -33,7 +33,7 @@ on:
 permissions: {}
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-weekly
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 533cf13bc7..bb59ceb707 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -47,7 +47,7 @@ on:
 permissions: {}
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-ci
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/gatekeeper-skipper.yaml b/.github/workflows/gatekeeper-skipper.yaml
index 9128cbd9ba..ffadde5459 100644
--- a/.github/workflows/gatekeeper-skipper.yaml
+++ b/.github/workflows/gatekeeper-skipper.yaml
@@ -32,7 +32,7 @@ on:
         value: ${{ jobs.skipper.outputs.skip_static }}
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-gatekeeper-skipper
   cancel-in-progress: true
 
 permissions: {}
diff --git a/.github/workflows/publish-kata-deploy-payload.yaml b/.github/workflows/publish-kata-deploy-payload.yaml
index 88aef36d0f..7913ffc220 100644
--- a/.github/workflows/publish-kata-deploy-payload.yaml
+++ b/.github/workflows/publish-kata-deploy-payload.yaml
@@ -35,7 +35,7 @@ on:
         required: true
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-${{ inputs.arch }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-${{ inputs.arch }}-publish-deploy
   cancel-in-progress: true
 
 permissions: {}
diff --git a/.github/workflows/run-cri-containerd-tests.yaml b/.github/workflows/run-cri-containerd-tests.yaml
index 82cfc0ed8b..e3b8405983 100644
--- a/.github/workflows/run-cri-containerd-tests.yaml
+++ b/.github/workflows/run-cri-containerd-tests.yaml
@@ -1,11 +1,5 @@
 name: CI | Run cri-containerd tests
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-
-permissions: {}
-
 on:
   workflow_call:
     inputs:
@@ -36,6 +30,13 @@ on:
         required: true
         type: string
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-cri-tests
+  cancel-in-progress: true
+
+permissions: {}
+
+
 jobs:
   run-cri-containerd:
     name: run-cri-containerd-${{ inputs.arch }} (${{ inputs.containerd_version }}, ${{ inputs.vmm }})
diff --git a/.github/workflows/run-metrics.yaml b/.github/workflows/run-metrics.yaml
index dfc51c068f..98c5c72b57 100644
--- a/.github/workflows/run-metrics.yaml
+++ b/.github/workflows/run-metrics.yaml
@@ -23,7 +23,7 @@ on:
         default: ""
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-metrics
   cancel-in-progress: true
 
 permissions: {}