Fix multicluster E2E tests

Author: kovayur

.github/workflows/multicluster-e2e.yaml

@@ -33,13 +33,24 @@ jobs:
     strategy:
       matrix:
        name: [acscs1, acscs2]
+    outputs:
+      cluster_id: ${{ steps.cluster_id.outputs.short_sha }}
     steps:
+      - name: Generate cluster ID
+        id: cluster_id
+        run: |
+          # OSD cluster names are limited to 15 characters.
+          # Use first 7 chars of commit SHA for traceability and uniqueness.
+          # Format: <prefix>-<7-char-sha> (e.g., acscs1-a1b2c3d = 14 chars)
+          SHORT_SHA=$(echo "${{ github.sha }}" | cut -c1-7)
+          echo "short_sha=$SHORT_SHA" >> $GITHUB_OUTPUT
+
       - name: Create cluster
         uses: stackrox/actions/infra/create-cluster@v1
         with:
           token: ${{ secrets.INFRA_TOKEN }}
           flavor: osd-on-aws
-          name: ${{ matrix.name }}-${{ github.run_id }}${{ github.run_attempt }}
+          name: ${{ matrix.name }}-${{ steps.cluster_id.outputs.short_sha }}
           lifespan: 3h
           args: nodes=3,machine-type=m5.2xlarge
           wait: true
@@ -66,13 +77,14 @@ jobs:
       - name: Set cluster credentials
         run: |
           set -eo pipefail
+          SHORT_SHA=$(echo "${{ github.sha }}" | cut -c1-7)
           mkdir kube
           cluster1Conf="$(pwd)/kube/cluster1"
-          url=$(infractl artifacts "acscs1-${{ github.run_id }}${{ github.run_attempt }}" --json | jq '.Artifacts[] | select(.Name=="kubeconfig") | .URL' -r)
+          url=$(infractl artifacts "acscs1-${SHORT_SHA}" --json | jq '.Artifacts[] | select(.Name=="kubeconfig") | .URL' -r)
           wget -O "$cluster1Conf" "$url"
 
           cluster2Conf="$(pwd)/kube/cluster2"
-          url=$(infractl artifacts "acscs2-${{ github.run_id }}${{ github.run_attempt }}" --json | jq '.Artifacts[] | select(.Name=="kubeconfig") | .URL' -r)
+          url=$(infractl artifacts "acscs2-${SHORT_SHA}" --json | jq '.Artifacts[] | select(.Name=="kubeconfig") | .URL' -r)
           wget -O "$cluster2Conf" "$url"
 
           echo "CLUSTER_1_KUBECONFIG=$cluster1Conf" >> "$GITHUB_ENV"
@@ -112,6 +124,7 @@ jobs:
       - name: Delete test clusters
         run: |
           set -o pipefail
-          infractl delete "acscs1-${{ github.run_id }}${{ github.run_attempt }}"
-          infractl delete "acscs2-${{ github.run_id }}${{ github.run_attempt }}"
+          SHORT_SHA=$(echo "${{ github.sha }}" | cut -c1-7)
+          infractl delete "acscs1-${SHORT_SHA}"
+          infractl delete "acscs2-${SHORT_SHA}"
           exit 0