From 1481b1a614145b1335f8768a534c8d81fd01e991 Mon Sep 17 00:00:00 2001
From: Robert Kibble <robert.kibble@version1.com>
Date: Wed, 8 Nov 2023 13:18:19 +0000
Subject: [PATCH 1/3] BAU Concurrent and finalise workflow

---
 .github/workflows/copilot_deploy.yml | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/copilot_deploy.yml b/.github/workflows/copilot_deploy.yml
index 42fd2ee..cacc7dd 100644
--- a/.github/workflows/copilot_deploy.yml
+++ b/.github/workflows/copilot_deploy.yml
@@ -76,16 +76,21 @@ jobs:
             echo "env_list=[\"dev\", \"test\"]" >> $GITHUB_OUTPUT
           fi
 
-  copilot_environments_deploy:
-    concurrency: account-store-environment-deploy
+  copilot_env_deploy:
+    concurrency:
+      group: '${{ github.workflow }} @ ${{ github.ref }}'
+      cancel-in-progress: false
     permissions:
       id-token: write # This is required for requesting the JWT
       contents: read  # This is required for actions/checkout
     needs: [ tag_version, pre_deploy_tests, paketo_build, copilot_environments_workflow_setup ]
     runs-on: ubuntu-latest
+    continue-on-error: true
     strategy:
+      max-parallel: 1
       matrix:
         value: ${{ fromJSON(needs.copilot_environments_workflow_setup.outputs.matrix) }}
+      fail-fast: false
     environment: ${{ matrix.value }}
     steps:
     - name: Git clone the repository
@@ -100,7 +105,7 @@ jobs:
       uses: aws-actions/configure-aws-credentials@v4
       with:
         role-to-assume: arn:aws:iam::${{ secrets.AWS_ACCOUNT }}:role/GithubCopilotDeploy
-        role-session-name: NOTIFICATION_${{ matrix.value }}_COPILOT_${{ steps.currentdatetime.outputs.datetime }}
+        role-session-name: ACCOUNT_STORE_${{ matrix.value }}_COPILOT_${{ steps.currentdatetime.outputs.datetime }}
         aws-region: eu-west-2
 
     - name: Install AWS Copilot CLI
@@ -129,7 +134,7 @@ jobs:
         E2E_PAT: ${{secrets.E2E_PAT}}
       uses: communitiesuk/funding-service-design-workflows/.github/workflows/post-deploy.yml@main
       with:
-        run_performance_tests: ${{ inputs.run_performance_tests }}
-        run_e2e_tests: ${{ inputs.run_e2e_tests }}
+        run_performance_tests: ${{ inputs.run_performance_tests || false }}
+        run_e2e_tests: ${{ inputs.run_e2e_tests || true }}
         app_name: application
         environment: ${{ inputs.environment == '' && 'test' || inputs.environment }}

From f3f67b3f866a918560f203d5ca99057bc4eb9707 Mon Sep 17 00:00:00 2001
From: Robert Kibble <robert.kibble@version1.com>
Date: Wed, 8 Nov 2023 13:32:31 +0000
Subject: [PATCH 2/3] Amend dependency name

---
 .github/workflows/copilot_deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/copilot_deploy.yml b/.github/workflows/copilot_deploy.yml
index cacc7dd..5c6f8f9 100644
--- a/.github/workflows/copilot_deploy.yml
+++ b/.github/workflows/copilot_deploy.yml
@@ -128,7 +128,7 @@ jobs:
 
   # Can we realistically run E2E at this stage, or just plump for application on the grounds it checks account-store is operational?
   post_deploy_tests:
-      needs: copilot_environments_deploy
+      needs: copilot_env_deploy
       if: inputs.environment == 'test' || inputs.environment == 'dev' || inputs.environment == ''
       secrets:
         E2E_PAT: ${{secrets.E2E_PAT}}

From cc27379e0904118cfec6e4d4c5aa74b4ae8863fd Mon Sep 17 00:00:00 2001
From: Robert Kibble <robert.kibble@version1.com>
Date: Wed, 8 Nov 2023 13:59:02 +0000
Subject: [PATCH 3/3] Another notification -> change

---
 .github/workflows/copilot_deploy.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/copilot_deploy.yml b/.github/workflows/copilot_deploy.yml
index 5c6f8f9..441eb7e 100644
--- a/.github/workflows/copilot_deploy.yml
+++ b/.github/workflows/copilot_deploy.yml
@@ -38,9 +38,9 @@ jobs:
   tag_version:
     runs-on: ubuntu-latest
     outputs:
-      version_to_tag: ${{ steps.notification_tagging.outputs.tag_value }}
+      version_to_tag: ${{ steps.account_store_tagging.outputs.tag_value }}
     steps:
-      - id: notification_tagging
+      - id: account_store_tagging
         run: |
           echo "tag_value=$(echo '${{ github.ref }}' | sed -e 's,.*/\(.*\),\1,')" >> $GITHUB_OUTPUT