ci: prevent duplicate artifact naming in same workflow (#2903)

Signed-off-by: Daniel Weiße <[email protected]>
edgelesssys · Feb 12, 2024 · c5b17fb · c5b17fb
1 parent d3b3f45
commit c5b17fb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 19 deletions.
diff --git a/.github/workflows/e2e-test-provider-example.yml b/.github/workflows/e2e-test-provider-example.yml
@@ -83,20 +83,6 @@ jobs:
           ref: main
           stream: nightly
 
-      - name: Upload Terraform module
-        uses: ./.github/actions/upload_terraform_module
-
-      - name: Download Terraform module
-        uses: actions/download-artifact@f44cd7b40bfd40b6aa1cc1b9b5b7bf03d3c67110 # v4.1.0
-        with:
-          name: terraform-module
-
-      - name: Unzip Terraform module
-        shell: bash
-        run: |
-          unzip terraform-module.zip -d ${{ github.workspace }}
-          rm terraform-module.zip
-
       - name: Create resource prefix
         id: create-prefix
         shell: bash
@@ -213,8 +199,8 @@ jobs:
           version=${prefixed_version#v} # remove v prefix
 
           if [[ "${{ inputs.providerVersion }}" == "" ]]; then
-            iam_src="${{ github.workspace }}/terraform-module/iam/${{ steps.determine.outputs.cloudProvider }}"
-            infra_src="${{ github.workspace }}/terraform-module/${{ steps.determine.outputs.cloudProvider }}"
+            iam_src="${{ github.workspace }}/terraform/infrastructure/iam/${{ steps.determine.outputs.cloudProvider }}"
+            infra_src="${{ github.workspace }}/terraform/infrastructure/${{ steps.determine.outputs.cloudProvider }}"
           else
             iam_src="https://github.com/edgelesssys/constellation/releases/download/${{ inputs.providerVersion }}/terraform-module.zip//terraform-module/iam/${{ steps.determine.outputs.cloudProvider }}"
             infra_src="https://github.com/edgelesssys/constellation/releases/download/${{ inputs.providerVersion }}/terraform-module.zip//terraform-module/${{ steps.determine.outputs.cloudProvider }}"

diff --git a/.github/workflows/e2e-upgrade.yml b/.github/workflows/e2e-upgrade.yml
@@ -174,7 +174,7 @@ jobs:
       - name: Upload CLI binary
         uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
         with:
-          name: constellation
+          name: constellation-upgrade-${{ inputs.attestationVariant }}
           path: build/constellation
 
   create-cluster:
@@ -336,7 +336,7 @@ jobs:
       - name: Download CLI
         uses: actions/download-artifact@f44cd7b40bfd40b6aa1cc1b9b5b7bf03d3c67110 # v4.1.0
         with:
-          name: constellation
+          name: constellation-upgrade-${{ inputs.attestationVariant }}
           path: build
 
       - name: Download Working Directory (Pre-test)
@@ -459,7 +459,7 @@ jobs:
       - name: Download CLI
         uses: actions/download-artifact@f44cd7b40bfd40b6aa1cc1b9b5b7bf03d3c67110 # v4.1.0
         with:
-          name: constellation
+          name: constellation-upgrade-${{ inputs.attestationVariant }}
           path: build
 
       - name: Download Working Directory (Pre-test)