From d5ca073b053cfab246e063f2869a173b2a79d23c Mon Sep 17 00:00:00 2001
From: Robert Kibble <robert.kibble@version1.com>
Date: Wed, 7 Feb 2024 11:32:18 +0000
Subject: [PATCH 1/2] BAU - Make concurrency common between deploy and test

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

diff --git a/.github/workflows/copilot_deploy.yml b/.github/workflows/copilot_deploy.yml
index 1c6294c..d573e55 100644
--- a/.github/workflows/copilot_deploy.yml
+++ b/.github/workflows/copilot_deploy.yml
@@ -92,7 +92,7 @@ jobs:
   post_dev_deploy_tests:
     needs: dev_deploy
     concurrency:
-      group: 'fsd-preaward-test-dev'
+      group: 'fsd-preaward-dev'
       cancel-in-progress: false
     secrets:
       FSD_GH_APP_ID: ${{ secrets.FSD_GH_APP_ID }}
@@ -119,7 +119,7 @@ jobs:
   post_test_deploy_tests:
     needs: test_deploy
     concurrency:
-      group: 'fsd-preaward-test-test'
+      group: 'fsd-preaward-test'
       cancel-in-progress: false
     secrets:
       FSD_GH_APP_ID: ${{ secrets.FSD_GH_APP_ID }}
@@ -146,7 +146,7 @@ jobs:
   post_uat_deploy_tests:
     needs: uat_deploy
     concurrency:
-      group: 'fsd-preaward-test-uat'
+      group: 'fsd-preaward-uat'
       cancel-in-progress: false
     secrets:
       FSD_GH_APP_ID: ${{ secrets.FSD_GH_APP_ID }}

From 78353dbd86be8a0a675e50d52851324fb81683c7 Mon Sep 17 00:00:00 2001
From: Robert Kibble <robert.kibble@version1.com>
Date: Wed, 7 Feb 2024 11:53:47 +0000
Subject: [PATCH 2/2] Add condition to allow testing on manual deploy

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

diff --git a/.github/workflows/copilot_deploy.yml b/.github/workflows/copilot_deploy.yml
index d573e55..1f2f1f1 100644
--- a/.github/workflows/copilot_deploy.yml
+++ b/.github/workflows/copilot_deploy.yml
@@ -118,6 +118,7 @@ jobs:
 
   post_test_deploy_tests:
     needs: test_deploy
+    if: ${{ always() && contains(fromJSON(needs.setup.outputs.jobs_to_run), 'test') && (! contains(needs.*.result, 'failure') ) && (! contains(needs.*.result, 'cancelled') )}}
     concurrency:
       group: 'fsd-preaward-test'
       cancel-in-progress: false
@@ -145,6 +146,7 @@ jobs:
 
   post_uat_deploy_tests:
     needs: uat_deploy
+    if: ${{ always() && contains(fromJSON(needs.setup.outputs.jobs_to_run), 'uat') && (! contains(needs.*.result, 'failure') ) && (! contains(needs.*.result, 'cancelled') )}}
     concurrency:
       group: 'fsd-preaward-uat'
       cancel-in-progress: false