CCM-11942 fixing environment refs for acceptance tests

Author: aidenvaines-cgi

.github/workflows/cicd-1-pull-request.yaml

@@ -50,12 +50,18 @@ jobs:
         run: |
           branch_name=${GITHUB_HEAD_REF:-$(echo $GITHUB_REF | sed 's#refs/heads/##')}
           echo "Current branch is '$branch_name'"
-          if gh pr list --head $branch_name | grep -q .; then
-            echo "Pull request exists"
+
+          pr_json=$(gh pr list --head "$branch_name" --state open --json number --limit 1)
+          pr_number=$(echo "$pr_json" | jq -r '.[0].number // empty')
+
+          if [[ -n "$pr_number" ]]; then
+            echo "Pull request exists: #$pr_number"
             echo "does_pull_request_exist=true" >> $GITHUB_OUTPUT
+            echo "pr_number=$pr_number" >> $GITHUB_OUTPUT
           else
             echo "Pull request doesn't exist"
             echo "does_pull_request_exist=false" >> $GITHUB_OUTPUT
+            echo "pr_number=" >> $GITHUB_OUTPUT
           fi
       - name: "List variables"
         run: |
@@ -68,6 +74,7 @@ jobs:
           export TERRAFORM_VERSION="${{ steps.variables.outputs.terraform_version }}"
           export VERSION="${{ steps.variables.outputs.version }}"
           export DOES_PULL_REQUEST_EXIST="${{ steps.pr_exists.outputs.does_pull_request_exist }}"
+          export IS_VERSION_PRERELEASE="${{ steps.variables.outputs.is_version_prerelease }}"
           make list-variables
   commit-stage: # Recommended maximum execution time is 2 minutes
     name: "Commit stage"
@@ -99,4 +106,7 @@ jobs:
     name: "Acceptance stage"
     needs: [metadata, test-stage]
     uses: ./.github/workflows/stage-4-acceptance.yaml
+    if: needs.metadata.outputs.does_pull_request_exist == 'true' || (github.event_name == 'pull_request' && (github.event.action == 'opened' || github.event.action == 'reopened')) || (github.event_name == 'push' && github.ref == 'refs/heads/main')
     secrets: inherit
+    with:
+      pr_number: ${{ needs.metadata.outputs.pr_number }}

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

@@ -2,6 +2,11 @@ name: Acceptance stage
 
 on:
   workflow_call:
+    inputs:
+      pr_number:
+        required: true
+        type: string
+
 
 permissions:
   id-token: write
@@ -25,7 +30,7 @@ jobs:
             --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 }}" \
+            --targetEnvironment "pr${{ inputs.pr_number }}" \
             --targetAccountGroup "nhs-notify-template-management-dev" \
             --targetComponent "sandbox" \
             --terraformAction "apply"
@@ -40,6 +45,6 @@ jobs:
             --infraRepoName "nhs-notify-web-template-management" \
             --releaseVersion "${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" \
             --targetWorkflow "dispatch-contextual-tests-dynamic-env.yaml" \
-            --targetEnvironment "${{ needs.generate-sandbox-name.outputs.SANDBOX_NAME }}" \
+            --targetEnvironment "pr${{ inputs.pr_number }}" \
             --targetAccountGroup "nhs-notify-template-management-dev" \
             --targetComponent "sandbox"