VIA-598 AJ Cleanup and simplify rest of the workflows

ankur-jain-nhs · ankur-jain-nhs · commit 5d01e92a19af · 2025-11-26T08:16:46.000Z
diff --git a/.github/workflows/cicd-1-pull-request.yaml b/.github/workflows/cicd-1-pull-request.yaml
@@ -131,11 +131,11 @@ jobs:
     secrets: inherit
 
   #############################################################
-  # Deploy stage - download artefacts and deploy to AWS
+  # Deploy action - download artefacts and deploy to AWS
   #############################################################
 
-  deploy-stage:
-    name: "Deploy stage"
+  deploy-action:
+    name: "Deploy action (main only)"
     needs: [ metadata, build-stage ]
     if: github.ref == 'refs/heads/main'
     runs-on: ubuntu-latest
@@ -163,12 +163,11 @@ jobs:
   #############################################################
 
   acceptance-stage: # Recommended maximum execution time is 10 minutes
-    name: "Acceptance stage"
-    needs: [ metadata, deploy-stage ]
+    name: "Acceptance stage (main only)"
+    needs: [ metadata, deploy-action ]
     if: github.ref == 'refs/heads/main'
     uses: ./.github/workflows/stage-5-acceptance.yaml
     with:
       environment: "dev"
       checkout_ref: "${{ github.sha }}"
-      release: "Latest main tag"
     secrets: inherit
diff --git a/.github/workflows/cicd-3-deploy.yaml b/.github/workflows/cicd-3-deploy.yaml
@@ -7,66 +7,18 @@ on:
         description: 'Environment to deploy to'
         type: environment
         required: true
-      release:
-        description: 'Run assurance tests based on Hub URL for'
-        type: choice
-        options:
-          - R1
-          - Latest main
 
 env:
   AWS_REGION: eu-west-2
 
 jobs:
-  metadata:
-    name: "Set CI/CD metadata"
-    runs-on: ubuntu-latest
-    timeout-minutes: 1
-    outputs:
-      build_datetime: ${{ steps.variables.outputs.build_datetime }}
-      build_timestamp: ${{ steps.variables.outputs.build_timestamp }}
-      build_epoch: ${{ steps.variables.outputs.build_epoch }}
-      nodejs_version: ${{ steps.variables.outputs.nodejs_version }}
-      python_version: ${{ steps.variables.outputs.python_version }}
-      terraform_version: ${{ steps.variables.outputs.terraform_version }}
-      version: ${{ steps.variables.outputs.version }}
-      tag: ${{ steps.variables.outputs.tag }}
-    steps:
-      - name: "Check ref"
-        run: |
-          if ${{ !startsWith(github.ref, 'refs/tags/') }}; then
-            echo "❌ Only tagged deployments allowed."
-            exit 1
-          fi
-      - name: "Checkout code"
-        uses: actions/checkout@v6
-      - name: "Set CI/CD variables"
-        id: variables
-        run: |
-          datetime=$(date -u +'%Y-%m-%dT%H:%M:%S%z')
-          echo "build_datetime=$datetime" | tee -a $GITHUB_OUTPUT
-          echo "build_timestamp=$(date --date=$datetime -u +'%Y%m%d%H%M%S')" | tee -a $GITHUB_OUTPUT
-          echo "build_epoch=$(date --date=$datetime -u +'%s')" | tee -a $GITHUB_OUTPUT
-          echo "nodejs_version=$(grep "^nodejs" .tool-versions | cut -f2 -d' ')" | tee -a $GITHUB_OUTPUT
-          echo "python_version=$(grep "^nodejs" .tool-versions | cut -f2 -d' ')" | tee -a $GITHUB_OUTPUT
-          echo "terraform_version=$(grep "^terraform" .tool-versions | cut -f2 -d' ')" | tee -a $GITHUB_OUTPUT
-          # TODO: Get the version, but it may not be the .version file as this should come from the CI/CD Pull Request Workflow
-          echo "version=$(head -n 1 .version 2> /dev/null || echo unknown)" | tee -a $GITHUB_OUTPUT
-          echo "tag=${{ github.ref_name }}" | tee -a $GITHUB_OUTPUT
-      - name: "List variables"
-        run: |
-          export BUILD_DATETIME="${{ steps.variables.outputs.build_datetime }}"
-          export BUILD_TIMESTAMP="${{ steps.variables.outputs.build_timestamp }}"
-          export BUILD_EPOCH="${{ steps.variables.outputs.build_epoch }}"
-          export NODEJS_VERSION="${{ steps.variables.outputs.nodejs_version }}"
-          export PYTHON_VERSION="${{ steps.variables.outputs.python_version }}"
-          export TERRAFORM_VERSION="${{ steps.variables.outputs.terraform_version }}"
-          export VERSION="${{ steps.variables.outputs.version }}"
-          export TAG="${{ steps.variables.outputs.tag }}"
-          make list-variables
-  deploy-stage:
-    name: "Deploy ${{ needs.metadata.outputs.tag }} to ${{ github.event.inputs.environment }}"
-    needs: [ metadata ]
+
+  #############################################################
+  # Deploy action - download artefacts and deploy to AWS
+  #############################################################
+
+  deploy-action:
+    name: "Deploy ${{ github.ref_name }} to (${{ github.event.inputs.environment }})"
     runs-on: ubuntu-latest
     environment:
       name: ${{ github.event.inputs.environment }}
@@ -78,30 +30,33 @@ jobs:
       id-token: write
       contents: read
     steps:
-      - name: "Tag or SHA"
-        id: tag-or-sha
+      - name: "Check is ${{ github.ref }} a tag"
         run: |
-          echo "value=${{ needs.metadata.outputs.tag }}" >> $GITHUB_OUTPUT
-      - name: "Checkout code"
-        uses: actions/checkout@v6
-        with:
-          ref: ${{ needs.metadata.outputs.tag }}
-      - name: "Deploy ${{ needs.metadata.outputs.tag }} to ${{ github.event.inputs.environment }}"
+          if ${{ !startsWith(github.ref, 'refs/tags/') }}; then
+            echo "❌ Only tagged deployments allowed."
+            exit 1
+          fi
+
+      - name: "Deploy application version ${{ github.ref_name }}"
         timeout-minutes: 10
         uses: ./.github/actions/deploy
         with:
           environment: ${{ github.event.inputs.environment }}
-          tag_or_sha_to_deploy: ${{ needs.metadata.outputs.tag }}
+          tag_or_sha_to_deploy: ${{ github.ref_name }}
           secret_aws_iam_role: ${{ secrets.IAM_ROLE }}
           secret_aws_account_id: ${{ secrets.AWS_ACCOUNT_ID }}
           secret_aws_slack_channel_id: ${{ secrets.ALARMS_SLACK_CHANNEL_ID }}
+
+  #############################################################
+  # Acceptance stage - E2E and contract tests
+  #############################################################
+
   acceptance-stage:
-    name: "Acceptance stage"
+    name: "Acceptance stage (dev/preprod only)"
     if: ${{ contains(fromJSON('["dev","preprod"]'), github.event.inputs.environment) }}
-    needs: [ metadata, deploy-stage ]
+    needs: [ deploy-action ]
     uses: ./.github/workflows/stage-5-acceptance.yaml
     with:
       environment: ${{ github.event.inputs.environment}}
-      checkout_ref: ${{ needs.metadata.outputs.tag }}
-      release: ${{ inputs.release }}
+      checkout_ref: ${{ github.ref_name }}
     secrets: inherit
diff --git a/.github/workflows/cicd-4-promote.yaml b/.github/workflows/cicd-4-promote.yaml
@@ -14,6 +14,11 @@ env:
   AWS_S3_TARGET_RELEASES_BUCKET: vita-${{ secrets.AWS_ACCOUNT_ID }}-releases-${{ github.event.inputs.environment }}
 
 jobs:
+
+  #################################################
+  # Set up metadata for the jobs
+  #################################################
+
   metadata:
     name: "Set CI/CD metadata"
     runs-on: ubuntu-latest
@@ -25,7 +30,7 @@ jobs:
       version: ${{ steps.variables.outputs.version }}
       release_tag: ${{ steps.variables.outputs.release_tag }}
     steps:
-      - name: "Check ref"
+      - name: "Check is ${{ github.ref }} a tag"
         run: |
           if ${{ !startsWith(github.ref, 'refs/tags/') }}; then
             echo "❌ Only tagged promotions allowed."
@@ -51,11 +56,15 @@ jobs:
           export VERSION="${{ steps.variables.outputs.version }}"
           export RELEASE_TAG="${{ steps.variables.outputs.release_tag }}"
           make list-variables
+
+  #################################################################
+  # Promote stage - promote builds from one environment to another
+  #################################################################
+
   promote-stage:
     name: "Promote stage"
-    needs: [ metadata ]
     uses: ./.github/workflows/stage-6-promote.yaml
     with:
       environment: ${{ inputs.environment }}
-      release_tag: ${{ needs.metadata.outputs.release_tag }}
+      release_tag: ${{ github.ref_name }}
     secrets: inherit
diff --git a/.github/workflows/stage-3-build.yaml b/.github/workflows/stage-3-build.yaml
@@ -38,7 +38,7 @@ env:
 
 jobs:
   build-and-package:
-    name: "Build and package"
+    name: "Build and upload artefacts"
     runs-on: ubuntu-latest
     environment:
       name: dev
diff --git a/.github/workflows/stage-4-deploy.yaml b/.github/workflows/stage-4-deploy.yaml
diff --git a/.github/workflows/stage-5-acceptance.yaml b/.github/workflows/stage-5-acceptance.yaml
@@ -16,14 +16,13 @@ on:
         required: false
         type: boolean
         default: false
-      release:
-        description: "Release name used to infer the URL of the VitA Hub page"
-        required: true
-        type: string
+
+env:
+  AWS_REGION: eu-west-2
 
 jobs:
   test-e2e:
-    name: "E2E Test: ${{inputs.environment}} environment"
+    name: "E2E Tests on (${{inputs.environment}})"
     runs-on: ubuntu-latest
     timeout-minutes: 30
     environment: ${{ inputs.environment }}
@@ -36,13 +35,14 @@ jobs:
     steps:
       - name: "Get URL of VitA Hub Page for release"
         id: get-hub-url
+        shell: bash
         run: |
-          if ${{ inputs.release == 'R1' || inputs.release == 'release1' }}; then
+          if [[ ${{ inputs.checkout_ref }} == v1.0.* }} ]]; then
             TEST_APP_URL=${{vars.TEST_APP_URL_R1}}
           else
             TEST_APP_URL=${{vars.TEST_APP_URL_MAIN}}
           fi
-          echo "test_app_url=$TEST_APP_URL" >> $GITHUB_OUTPUT
+          echo "test_app_url=$TEST_APP_URL" | tee -a $GITHUB_OUTPUT
 
       - name: "Checkout code"
         uses: actions/checkout@v6
@@ -54,9 +54,9 @@ jobs:
         with:
           role-session-name: GitHubActionsSession
           role-to-assume: ${{ secrets.IAM_ROLE }}
-          aws-region: eu-west-2
+          aws-region: ${{ env.AWS_REGION }}
 
-      - name: "Check expected version is running in ${{inputs.environment}}"
+      - name: "Check ${{ inputs.checkout_ref }} is running on (${{inputs.environment}})"
         timeout-minutes: 20
         shell: bash
         run: |
@@ -67,7 +67,7 @@ jobs:
             exit 1
           fi
 
-      - name: "Run E2E tests on ${{ inputs.checkout_ref }} (${{ inputs.environment }})"
+      - name: "Run E2E tests for version - ${{ inputs.checkout_ref }}"
         timeout-minutes: 10
         uses: ./.github/actions/run-e2e-tests
         with:
@@ -85,7 +85,7 @@ jobs:
           DEPLOY_ENVIRONMENT: ${{ inputs.environment }}
 
   test-contract:
-    name: "Contract Test: ${{inputs.environment}} environment"
+    name: "Contract Tests on (${{inputs.environment}})"
     runs-on: ubuntu-latest
     timeout-minutes: 5
     environment: ${{ inputs.environment }}
@@ -95,7 +95,7 @@ jobs:
         with:
           ref: ${{ inputs.checkout_ref }}
 
-      - name: "Run contract tests (sandpit+mocked)"
+      - name: "Run contract tests for version - ${{ inputs.checkout_ref }} (EliD:sandpit, EliD:mocked)"
         timeout-minutes: 3
         uses: ./.github/actions/run-contract-tests
         with:
diff --git a/.github/workflows/stage-6-promote.yaml b/.github/workflows/stage-6-promote.yaml
