From 242958f63ae5ddde10a0962cede7c99ed9b2fd3d Mon Sep 17 00:00:00 2001
From: miampf <miampf@proton.me>
Date: Wed, 3 Apr 2024 18:11:03 +0200
Subject: [PATCH] prevent double state upload

---
 .github/workflows/e2e-upgrade.yml | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/e2e-upgrade.yml b/.github/workflows/e2e-upgrade.yml
index f1a0fa17c..a884a963e 100644
--- a/.github/workflows/e2e-upgrade.yml
+++ b/.github/workflows/e2e-upgrade.yml
@@ -189,6 +189,7 @@ jobs:
     needs: [generate-input-parameters]
     outputs:
       kubeconfig: ${{ steps.e2e_test.outputs.kubeconfig }}
+      e2e-name-prefix: ${{ steps.e2e_test.outputs.namePrefix }}
     steps:
       - name: Checkout
         if: inputs.gitRef == 'head'
@@ -517,16 +518,6 @@ jobs:
           cp -r constellation-iam-terraform to-zip
           rm -rf to-zip/constellation-iam-terraform/.terraform
 
-      - name: Upload terraform state
-        if: always()
-        uses: ./.github/actions/artifact_upload
-        with:
-          name: terraform-state-${{ github.run_id }}
-          path: >
-            to-zip/constellation-terraform
-            to-zip/constellation-iam-terraform
-          encryptionSecret: ${{ secrets.ARTIFACT_ENCRYPT_PASSWD }}
-
       - name: Always terminate cluster
         if: always()
         uses: ./.github/actions/constellation_destroy
@@ -561,7 +552,7 @@ jobs:
           GH_TOKEN: ${{ github.token }}
         uses: ./.github/actions/artifact_delete
         with:
-          name: terraform-state-${{ github.run_id }}
+          name: terraform-state-${{ needs.e2e-upgrade.outputs.e2e-name-prefix }}
           workflowID: ${{ github.run_id }}
 
       - name: Prepare terraform state folders
@@ -587,7 +578,7 @@ jobs:
         if: always()
         uses: ./.github/actions/artifact_upload
         with:
-          name: terraform-state-${{ github.run_id }}
+          name: terraform-state-${{ needs.e2e-upgrade.outputs.e2e-name-prefix }}
           path: >
             ${{ env.TO_UPLOAD }}
           encryptionSecret: ${{ secrets.ARTIFACT_ENCRYPT_PASSWD }}