ci: fix artifact naming problems in e2e test (#2948)

* Fix potentially artifact naming in weekly tests
* Use e2e prefix for artifact naming in e2e-benchmark

---------

Signed-off-by: Daniel Weiße <dw@edgeless.systems>

.github/actions/e2e_benchmark/action.yml

@@ -21,6 +21,9 @@ inputs:
   awsOpenSearchPwd:
     description: "AWS OpenSearch Password to upload the results."
     required: false
+  artifactNameSuffix:
+    description: "Suffix for artifact naming."
+    required: true
   encryptionSecret:
     description: 'The secret to use for encrypting the artifact.'
     required: true
@@ -103,7 +106,7 @@ runs:
       uses: ./.github/actions/artifact_upload
       with:
         path: "out/fio-constellation-${{ inputs.cloudProvider }}.json"
-        name: "fio-constellation-${{ inputs.cloudProvider }}.json"
+        name: "fio-constellation-${{ inputs.artifactNameSuffix }}.json"
         encryptionSecret: ${{ inputs.encryptionSecret }}
 
     - name: Run knb benchmark
@@ -125,7 +128,7 @@ runs:
       uses: ./.github/actions/artifact_upload
       with:
         path: "out/knb-constellation-${{ inputs.cloudProvider }}.json"
-        name: "knb-constellation-${{ inputs.cloudProvider }}.json"
+        name: "knb-constellation-${{ inputs.artifactNameSuffix }}.json"
         encryptionSecret: ${{ inputs.encryptionSecret }}
 
     - name: Parse results, create diagrams and post the progression summary
@@ -146,7 +149,7 @@ runs:
       with:
         path: >
           benchmarks/constellation-${{ inputs.cloudProvider }}.json
-        name: "benchmarks-${{ inputs.attestationVariant }}"
+        name: "benchmarks-${{ inputs.artifactNameSuffix }}"
         encryptionSecret: ${{ inputs.encryptionSecret }}
 
     - name: Assume AWS role to retrieve and update benchmarks in S3

.github/actions/e2e_test/action.yml

@@ -377,6 +377,7 @@ runs:
         awsOpenSearchUsers: ${{ inputs.awsOpenSearchUsers }}
         awsOpenSearchPwd: ${{ inputs.awsOpenSearchPwd }}
         encryptionSecret: ${{ inputs.encryptionSecret }}
+        artifactNameSuffix: ${{ steps.create-prefix.outputs.prefix }}
 
     - name: Run constellation verify test
       if: inputs.test == 'verify'

.github/workflows/e2e-upgrade.yml

@@ -496,7 +496,7 @@ jobs:
         if: always()
         uses: ./.github/actions/artifact_upload
         with:
-          name: upgrade-logs
+          name: upgrade-logs-${{ inputs.attestationVariant }}
           path: >
             node-operator.logs
             node-maintenance-operator.logs