use label for report name

.github/actions/smoke-tests/action.yaml

@@ -25,6 +25,9 @@ inputs:
   marker:
     description: Marker to use
     required: false
+  label:
+    description: Label for test
+    required: false
   azure-ad-secret:
     description: Azure Active Directory secret for JWKs
     required: false
@@ -45,12 +48,13 @@ runs:
       run: |
         make -f tests/Makefile create-kind-cluster K8S_CLUSTER_NAME=${{ github.run_id }} K8S_CLUSTER_VERSION=${{ inputs.k8s-version }} K8S_TIMEOUT=${{ inputs.k8s-timeout }}
         make -f tests/Makefile image-load REGISTRY="" PREFIX=${{ inputs.image-name }} TAG=${{ inputs.tag }} K8S_CLUSTER_NAME=${{ github.run_id }}
-        marker="${{ inputs.marker }}"
-        nospaces="${marker// /_}"
-        sanitized_marker="${nospaces//\'/}"
-        name="${sanitized_marker:-${{ inputs.k8s-version }}}"
+        label="${{ inputs.label }}"
+        nospaces="${label// /_}"
+        noslash="${nospaces//\//_}"
+        sanitized_marker="${noslash//\'/}"
+        name="${sanitized_marker}-${{ inputs.k8s-version }}"
         cluster_ip=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' ${{ github.run_id }}-control-plane)
-        test_name=tests-nginx-${{ inputs.image-type }}-$name.html
+        test_name=tests-nginx-${{ inputs.image-type }}-${name}.html
         test_output_path=${{ github.workspace }}/tests/${test_name}
         echo "cluster_ip=${cluster_ip}" >> $GITHUB_OUTPUT
         echo "test_name=${test_name}" >> $GITHUB_OUTPUT

.github/workflows/ci.yml

@@ -660,6 +660,7 @@ jobs:
       target: ${{ matrix.images.target }}
       nap-modules: ${{ matrix.images.nap_modules }}
       marker: ${{ matrix.images.marker }}
+      label: ${{ matrix.images.label }}
       go-md5: ${{ needs.checks.outputs.go_code_md5 }}
       build-tag: ${{ needs.checks.outputs.build_tag }}
       stable-tag: ${{ needs.checks.outputs.stable_tag }}
@@ -686,6 +687,7 @@ jobs:
       target: ${{ matrix.images.target }}
       nap-modules: ${{ matrix.images.nap_modules }}
       marker: ${{ matrix.images.marker }}
+      label: ${{ matrix.images.label }}
       go-md5: ${{ needs.checks.outputs.go_code_md5 }}
       build-tag: ${{ needs.checks.outputs.build_tag }}
       stable-tag: ${{ needs.checks.outputs.stable_tag }}
@@ -712,6 +714,7 @@ jobs:
       target: ${{ matrix.images.target }}
       nap-modules: ${{ matrix.images.nap_modules }}
       marker: ${{ matrix.images.marker }}
+      label: ${{ matrix.images.label }}
       go-md5: ${{ needs.checks.outputs.go_code_md5 }}
       build-tag: ${{ needs.checks.outputs.build_tag }}
       stable-tag: ${{ needs.checks.outputs.stable_tag }}

.github/workflows/setup-smoke.yml

@@ -15,6 +15,9 @@ on:
       marker:
         required: true
         type: string
+      label:
+        required: true
+        type: string
       go-md5:
         required: true
         type: string
@@ -150,6 +153,7 @@ jobs:
           image-name: ${{ steps.image_details.outputs.name }}
           tag: ${{ steps.image_details.outputs.build_tag }}
           marker: ${{ inputs.marker != '' && inputs.marker || '' }}
+          label: ${{ inputs.label }}
           k8s-version: ${{ inputs.k8s-version }}
           azure-ad-secret: ${{ secrets.AZURE_AD_AUTOMATION }}
           test-image: "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/test-runner:${{ hashFiles('./tests/requirements.txt') || 'latest' }}"
@@ -158,6 +162,6 @@ jobs:
       - name: Upload Test Results
         uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
         with:
-          name: ${{ steps.smoke-tests.outputs.test-results-name }}-${{ inputs.k8s-version }}
+          name: ${{ steps.smoke-tests.outputs.test-results-name }}
           path: ${{ steps.smoke-tests.outputs.test-results-path }}
         if: always()