CCM-10294: temp testing change

Author: mark-r-bjss

.github/workflows/dispatch_internal_repo_workflow.yaml

@@ -58,6 +58,7 @@ jobs:
       - name: Trigger nhs-notify-internal workflow
         shell: bash
         run: |
+          echo "debugging=$GITHUB_ENV"
           DISPATCH_EVENT=$(jq -ncM \
             --arg infraRepoName "${{ inputs.infraRepoName }}" \
             --arg releaseVersion ${{ inputs.releaseVersion }} \

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

@@ -32,10 +32,11 @@ jobs:
           echo '${{ toJson(github) }}'
           REF=${{ github.ref }}
           echo "REF=$REF"
-          pwd
-          ls
-          ls ./scripts
-          . ./scripts/sandbox-utils.sh "$REF"
+          SANDBOX_NAME=$(./scripts/sandbox-utils.sh "$REF")
+          echo "SANDBOX_NAME=$SANDBOX_NAME"
+          echo "BEFORE: $GITHUB_ENV"
+          echo "SANDBOX_NAME=$SANDBOX_NAME" >> $GITHUB_ENV
+          echo "AFTER: $GITHUB_ENV"
 
   sandbox-set-up:
     name: Step 1
@@ -69,19 +70,19 @@ jobs:
       targetAccountGroup: nhs-notify-template-management-dev
       targetComponent: sandbox
 
-  # sandbox-tear-down:
-  #   name: Step 3
-  #   needs: acceptance-tests
-  #   if: always()
+  sandbox-tear-down:
+    name: Step 3
+    needs: acceptance-tests
+    if: always()
 
-  #   uses: ./.github/workflows/dispatch_internal_repo_workflow.yaml
-  #   secrets: inherit
-  #   with:
-  #     jobName: Sandbox tear down
-  #     infraRepoName: nhs-notify-web-template-management
-  #     releaseVersion: ${{ github.head_ref || github.ref_name }}
-  #     targetWorkflow: dispatch-deploy-dynamic-env.yaml
-  #     targetEnvironment: pr${{ github.event.number }}
-  #     targetAccountGroup: nhs-notify-template-management-dev
-  #     targetComponent: sandbox
-  #     terraformAction: destroy
+    uses: ./.github/workflows/dispatch_internal_repo_workflow.yaml
+    secrets: inherit
+    with:
+      jobName: Sandbox tear down
+      infraRepoName: nhs-notify-web-template-management
+      releaseVersion: ${{ github.head_ref || github.ref_name }}
+      targetWorkflow: dispatch-deploy-dynamic-env.yaml
+      targetEnvironment: pr${{ github.event.number }}
+      targetAccountGroup: nhs-notify-template-management-dev
+      targetComponent: sandbox
+      terraformAction: destroy

scripts/sandbox-utils.sh

@@ -1,14 +1,14 @@
 function generateSandboxName() {
-  # Example: feature/CCM-00000_branch-description
+  # Example: refs/heads/feature/CCM-00000_branch-description
   REF=$1
 
-  # Example: feature/ccm-00000_branch-description -> feature/CCm-00000_branch-desCription
+  # Example: refs/heads/feature/ccm-00000_branch-description -> refs/heads/feature/CCm-00000_branch-desCription
   SANITISED_REF1=${REF//c/C}
 
-  # Example: feature/CCm-00000_branch-desCription -> feature/CCM-00000_branch-desCription
+  # Example: refs/heads/feature/CCm-00000_branch-desCription -> refs/heads/feature/CCM-00000_branch-desCription
   SANITISED_REF2=${SANITISED_REF1//m/M}
 
-  # Example: 00000_branch-description
+  # Example: 00000_branch-desCription
   END_REF=(${SANITISED_REF2##*CCM-})
 
   if [[ $END_REF == $SANITISED_REF2 ]]; then
@@ -19,15 +19,15 @@ function generateSandboxName() {
     TICKET_NUMBER=${END_REF%%[_-]*}
   fi
 
-  # Example: 04f106adc56fc0460853351c314b670d  -
+  # Example: 32c80a37bd6ff73554bb26a7e8ddeec3  -
   HASH=$(md5sum <<<"$REF")
 
-  # Example: 0000004f106adc56fc0460853351c314b670d  -
+  # Example: 0000032c80a37bd6ff73554bb26a7e8ddeec3  -
   LONG_SANDBOX_NAME="$TICKET_NUMBER""$HASH"
 
   MAX_SANDBOX_LENGTH=8
 
-  # Example: 0000004f
+  # Example: 0000032c
   SANDBOX_NAME=${LONG_SANDBOX_NAME:0:MAX_SANDBOX_LENGTH}
   echo "$SANDBOX_NAME"
 }