CCM-11942 Uses shared dispatch workflow with tracking

Author: aidenvaines-cgi

.github/workflows/pr_create_dynamic_env.yaml

@@ -29,24 +29,3 @@ jobs:
             --targetComponent "branch" \
             --targetAccountGroup "nhs-notify-template-management-dev" \
             --terraformAction "apply"
-
-  create-sandbox-environment:
-    name: Create Sandbox Environment
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/[email protected]
-      - name: Trigger sandbox environment creation
-        shell: bash
-        env:
-          PR_TRIGGER_PAT: ${{ secrets.PR_TRIGGER_PAT }}
-        run: |
-          .github/scripts/dispatch_internal_repo_workflow.sh \
-            --jobName "Create PR Sandbox " \
-            --infraRepoName "nhs-notify-web-template-management" \
-            --releaseVersion "${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" \
-            --targetWorkflow "dispatch-deploy-dynamic-env.yaml" \
-            --targetEnvironment "pr${{ github.event.number }}" \
-            --targetAccountGroup "nhs-notify-template-management-dev" \
-            --targetComponent "sandbox" \
-            --terraformAction "apply"
-

.github/workflows/stage-4-acceptance.yaml

@@ -8,12 +8,28 @@ permissions:
   contents: read
 
 jobs:
-  acceptance-tests:
-    name: Acceptance Tests
+
+  create-sandbox-environment:
+    name: Create Sandbox Environment
     runs-on: ubuntu-latest
     steps:
       - uses: actions/[email protected]
 
+      - name: Trigger sandbox environment creation
+        shell: bash
+        env:
+          PR_TRIGGER_PAT: ${{ secrets.PR_TRIGGER_PAT }}
+        run: |
+          .github/scripts/dispatch_internal_repo_workflow.sh \
+            --jobName "Create PR Sandbox " \
+            --infraRepoName "nhs-notify-web-template-management" \
+            --releaseVersion "${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" \
+            --targetWorkflow "dispatch-deploy-dynamic-env.yaml" \
+            --targetEnvironment "pr${{ github.event.number }}" \
+            --targetAccountGroup "nhs-notify-template-management-dev" \
+            --targetComponent "sandbox" \
+            --terraformAction "apply"
+
       - name: Acceptance Tests
         shell: bash
         env:
@@ -22,8 +38,8 @@ jobs:
           .github/scripts/dispatch_internal_repo_workflow.sh \
             --jobName "Acceptance tests" \
             --infraRepoName "nhs-notify-web-template-management" \
-            --releaseVersion "${{ github.head_ref || github.ref_name }}" \
+            --releaseVersion "${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" \
             --targetWorkflow "dispatch-contextual-tests-dynamic-env.yaml" \
             --targetEnvironment "${{ needs.generate-sandbox-name.outputs.SANDBOX_NAME }}" \
             --targetAccountGroup "nhs-notify-template-management-dev" \
-            --targetComponent "sandbox"
+            --targetComponent "sandbox"