Merge pull request #2468 from NHSDigital/develop

Author: sudhanshu-arya1

.github/CODEOWNERS

@@ -9,11 +9,11 @@
 
 # For version files that are updated by dependabot we have a cut down list
 
-/sandbox/Dockerfile @adamoldfield-nhs @nhsd-jack-wainwright @nhsd-sw @nhsd-dm @nhsd-andrew-tuley
-/sandbox/package.json @adamoldfield-nhs @nhsd-jack-wainwright @nhsd-sw @nhsd-dm @nhsd-andrew-tuley
-/sandbox/package-lock.json @adamoldfield-nhs @nhsd-jack-wainwright @nhsd-sw @nhsd-dm @nhsd-andrew-tuley
-/package.json @adamoldfield-nhs @nhsd-jack-wainwright @nhsd-sw @nhsd-dm @nhsd-andrew-tuley
-/package-lock.json @adamoldfield-nhs @nhsd-jack-wainwright @nhsd-sw @nhsd-dm @nhsd-andrew-tuley
-/poetry.lock @adamoldfield-nhs @nhsd-jack-wainwright @nhsd-sw @nhsd-dm @nhsd-andrew-tuley
-/poetry.toml @adamoldfield-nhs @nhsd-jack-wainwright @nhsd-sw @nhsd-dm @nhsd-andrew-tuley
-/pyproject.toml @adamoldfield-nhs @nhsd-jack-wainwright @nhsd-sw @nhsd-dm @nhsd-andrew-tuley
+/sandbox/Dockerfile @daniel-mcadam-nhs @kevinmason-nhs @sudhanshu-arya1 @adamoldfield-nhs @nhsd-jack-wainwright @nhsd-sw @nhsd-dm @nhsd-andrew-tuley
+/sandbox/package.json @daniel-mcadam-nhs @kevinmason-nhs @sudhanshu-arya1 @adamoldfield-nhs @nhsd-jack-wainwright @nhsd-sw @nhsd-dm @nhsd-andrew-tuley
+/sandbox/package-lock.json @daniel-mcadam-nhs @kevinmason-nhs @sudhanshu-arya1 @adamoldfield-nhs @nhsd-jack-wainwright @nhsd-sw @nhsd-dm @nhsd-andrew-tuley
+/package.json @daniel-mcadam-nhs @kevinmason-nhs @sudhanshu-arya1 @adamoldfield-nhs @nhsd-jack-wainwright @nhsd-sw @nhsd-dm @nhsd-andrew-tuley
+/package-lock.json @daniel-mcadam-nhs @kevinmason-nhs @sudhanshu-arya1 @adamoldfield-nhs @nhsd-jack-wainwright @nhsd-sw @nhsd-dm @nhsd-andrew-tuley
+/poetry.lock @daniel-mcadam-nhs @kevinmason-nhs @sudhanshu-arya1 @adamoldfield-nhs @nhsd-jack-wainwright @nhsd-sw @nhsd-dm @nhsd-andrew-tuley
+/poetry.toml @daniel-mcadam-nhs @kevinmason-nhs @sudhanshu-arya1 @adamoldfield-nhs @nhsd-jack-wainwright @nhsd-sw @nhsd-dm @nhsd-andrew-tuley
+/pyproject.toml @daniel-mcadam-nhs @kevinmason-nhs @sudhanshu-arya1 @adamoldfield-nhs @nhsd-jack-wainwright @nhsd-sw @nhsd-dm @nhsd-andrew-tuley

.github/workflows/continous-integration-workflow.yaml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0  # This causes all history to be fetched, which is required for calculate-version to function
 

azure/azure-pr-pipeline.yml

@@ -35,23 +35,6 @@ extends:
     manual_approval_env: manual-approval-ptl
     python_version: ${{ variables.python_version }}
     apigee_deployments:
-      - environment: manual-approval
-        stage_name: manual_approval_alpha_pr
-      - environment: internal-dev
-        service_name: ${{ variables.service_name }}-alpha
-        short_service_name: ${{ variables.short_service_name }}-alpha
-        service_base_path: ${{ variables.service_base_path }}-alpha
-        stage_name: ers_alpha_pr
-        jinja_templates:
-          ERS_TARGET_SERVER: e-referrals-service-api--alpha
-          ALLOW_ECHO_TARGET: true
-        post_deploy:
-        - template: templates/run-tests.yml
-          parameters:
-            integration_tests: true
-            smoke_tests: true
-        depends_on:
-        - manual_approval_alpha_pr
       - environment: manual-approval
         stage_name: manual_approval_ft01_pr
       - environment: internal-dev

azure/azure-release-pipeline.yml

@@ -35,23 +35,6 @@ extends:
     prod_producer_approval: true
     python_version: ${{ variables.python_version }}
     apigee_deployments:
-    - environment: manual-approval
-      stage_name: ers_manual_approval_alpha
-    - environment: internal-dev
-      stage_name: ers_alpha_release
-      service_name: "${{ variables.service_name }}-alpha"
-      short_service_name: "${{ variables.short_service_name }}-alpha"
-      service_base_path: "${{ variables.service_base_path }}-alpha"
-      jinja_templates:
-        ERS_TARGET_SERVER: e-referrals-service-api--alpha
-        ALLOW_ECHO_TARGET: true
-      post_deploy:
-      - template: templates/run-tests.yml
-        parameters:
-          integration_tests: true
-          smoke_tests: true
-      depends_on:
-      - ers_manual_approval_alpha
     - environment: manual-approval
       stage_name: ers_manual_approval_rc
     - environment: internal-dev

manifest_template.yml

@@ -14,8 +14,6 @@ APIGEE_ENVIRONMENTS:
   additional_proxies:
     - identity-service-mock-internal-dev
   variants:
-  - name: alpha-internal-dev
-    display_name: Internal Development - alpha
   - name: rc-internal-dev
     display_name: Internal Development - rc
   - name: fix-internal-dev