Merge pull request #338 from NHSDigital/feature/te-auto-test-deployments

(ELI-444) changed the trigger type to workflow call

Author: TOEL2

.github/workflows/cicd-2-publish.yaml

@@ -103,7 +103,6 @@ jobs:
           TF_VAR_SPLUNK_HEC_TOKEN: ${{ secrets.SPLUNK_HEC_TOKEN }}
           TF_VAR_SPLUNK_HEC_ENDPOINT: ${{ secrets.SPLUNK_HEC_ENDPOINT }}
 
-        # just planning for now for safety and until review
         run: |
           mkdir -p ./build
           echo "Running: make terraform env=$ENVIRONMENT workspace=$WORKSPACE stack=networking tf-command=apply"
@@ -119,29 +118,6 @@ jobs:
           git tag ${{ needs.metadata.outputs.version }}
           git push origin ${{ needs.metadata.outputs.version }}
 
-      # --- Keeping these just in case: Uncomment to release to GitHub ---
-      # - name: "Create release"
-      #   id: create_release
-      #   uses: actions/create-release@v1
-      #   env:
-      #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      #   with:
-      #     tag_name: ${{ needs.metadata.outputs.version }}
-      #     release_name: Release ${{ needs.metadata.outputs.version }}
-      #     body: |
-      #       Release of ${{ needs.metadata.outputs.version }}
-      #     draft: false
-      #     prerelease: true
-
-      # - name: "Upload release asset"
-      #   uses: actions/upload-release-asset@v1
-      #   env:
-      #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      #   with:
-      #     upload_url: "${{ steps.create_release.outputs.upload_url }}"
-      #     asset_path: ./build/lambda.zip
-      #     asset_name: lambda-${{ needs.metadata.outputs.version }}.zip
-      #     asset_content_type: application/zip
       - name: "Notify Slack on PR merge"
         uses: slackapi/[email protected]
         with:
@@ -153,3 +129,12 @@ jobs:
             Author: "${{ github.actor }}"
             title: "Pushed to main"
             version: "${{ needs.metadata.outputs.version }}"
+
+  call-deploy-test:
+    name: "Trigger TEST deploy (only on success)"
+    needs: publish
+    if: ${{ needs.publish.result == 'success' && github.ref == 'refs/heads/main' }}
+    uses: .github/workflows/cicd-3-test_auto.yaml
+    with:
+      ref: ${{ github.sha }}
+    secrets: inherit

.github/workflows/cicd-3-test_auto.yaml

@@ -1,9 +1,11 @@
 name: "Auto Deploy to test"
 
 on:
-  workflow_run:
-    workflows: ["CI/CD publish"]
-    types: [completed]
+  workflow_call:
+    inputs:
+      ref:
+        required: true
+        type: string
 
 concurrency:
   group: terraform-deploy-test
@@ -18,19 +20,14 @@ jobs:
   metadata:
     name: "Resolve metadata from triggering run"
     runs-on: ubuntu-latest
-    if: >
-      ${{
-        github.event.workflow_run.conclusion == 'success' &&
-        github.event.workflow_run.head_branch == 'main'
-      }}
     outputs:
       terraform_version: ${{ steps.vars.outputs.terraform_version }}
       tag: ${{ steps.tag.outputs.name }}
     steps:
       - name: "Checkout exact commit from CI/CD publish"
         uses: actions/checkout@v5
         with:
-          ref: ${{ github.event.workflow_run.head_sha }}
+          ref: ${{ inputs.ref }}
 
       - name: "Set CI/CD variables"
         id: vars
@@ -41,7 +38,7 @@ jobs:
         id: tag
         run: |
           git fetch --tags --force
-          SHA="${{ github.event.workflow_run.head_sha }}"
+          SHA="${{ inputs.ref }}"
           TAG=$(git tag --points-at "$SHA" | grep '^dev-' | head -n1 || true)
           if [ -z "$TAG" ]; then
             echo "No dev-* tag found on $SHA" >&2
@@ -62,7 +59,7 @@ jobs:
       - name: "Checkout same commit"
         uses: actions/checkout@v5
         with:
-          ref: ${{ github.event.workflow_run.head_sha }}
+          ref: ${{ inputs.ref }}
 
       - name: "Setup Terraform"
         uses: hashicorp/setup-terraform@v3