Merge pull request #913 from NHSDigital/develop

APIM-R 1.22 Cut

Author: nhsd-david-wass

azure/azure-release-pipeline.yml

@@ -32,9 +32,10 @@ extends:
     service_base_path: ${{ variables.service_base_path }}
     enable_status_monitoring: true
     manual_approval_env: manual-approval-ptl
+    prod_producer_approval: true
     apigee_deployments:
     - environment: manual-approval
-      stage_name: manual_approval_alpha
+      stage_name: ers_manual_approval_alpha
     - environment: internal-dev
       stage_name: ers_alpha_release
       service_name: "${{ variables.service_name }}-alpha"
@@ -49,9 +50,9 @@ extends:
           integration_tests: true
           smoke_tests: true
       depends_on:
-      - manual_approval_alpha
+      - ers_manual_approval_alpha
     - environment: manual-approval
-      stage_name: manual_approval_rc
+      stage_name: ers_manual_approval_rc
     - environment: internal-dev
       stage_name: ers_rc_release
       service_name: "${{ variables.service_name }}-rc"
@@ -66,7 +67,7 @@ extends:
           integration_tests: true
           smoke_tests: true
       depends_on:
-      - manual_approval_rc
+      - ers_manual_approval_rc
     - environment: internal-dev-sandbox
       proxy_path: sandbox
       post_deploy:
@@ -75,9 +76,9 @@ extends:
           smoke_tests: true
           sandbox_tests: true
       depends_on:
-      - manual_approval_rc
+      - ers_manual_approval_rc
     - environment: manual-approval
-      stage_name: manual_approval_fix
+      stage_name: ers_manual_approval_fix
     - environment: internal-dev
       stage_name: ers_fix_release
       service_name: "${{ variables.service_name }}-fix"
@@ -93,29 +94,29 @@ extends:
           integration_tests: true
           smoke_tests: true
       depends_on:
-      - manual_approval_fix
+      - ers_manual_approval_fix
     - environment: manual-approval
-      stage_name: manual_approval_sa
+      stage_name: ers_manual_approval_sa
     - environment: internal-qa
       stage_name: ers_sa_release
       post_deploy:
       - template: templates/run-tests.yml
         parameters:
           smoke_tests: true
       depends_on:
-      - manual_approval_sa
+      - ers_manual_approval_sa
     - environment: manual-approval
-      stage_name: manual_approval_int
+      stage_name: ers_manual_approval_int
     - environment: int
       stage_name: ers_int_release
       post_deploy:
       - template: templates/run-tests.yml
         parameters:
           smoke_tests: true
       depends_on:
-      - manual_approval_int
+      - ers_manual_approval_int
     - environment: manual-approval
-      stage_name: manual_approval_dep
+      stage_name: ers_manual_approval_dep
     - environment: dev
       stage_name: ers_dep_release
       service_name: "${{ variables.service_name }}-dep"
@@ -129,27 +130,31 @@ extends:
         parameters:
           smoke_tests: true
       depends_on:
-      - manual_approval_dep
+      - ers_manual_approval_dep
+    - environment: manual-approval
+      stage_name: ers_manual_approval_prod
+      depends_on:
+      - ers_sa_release
     - environment: prod
       stage_name: prod #revert to ers_prod_release when monitoring stack fixed to support it.
       post_deploy:
       - template: templates/run-tests.yml
         parameters:
           smoke_tests: true
       depends_on:
-      - ers_sa_release
+      - ers_manual_approval_prod
     - environment: internal-qa-sandbox
       proxy_path: sandbox
       depends_on:
-      - manual_approval_sa
+      - ers_manual_approval_sa
       post_deploy:
       - template: templates/run-tests.yml
         parameters:
           smoke_tests: true
     - environment: sandbox
       proxy_path: sandbox
       depends_on:
-      - manual_approval_int
+      - ers_manual_approval_int
       post_deploy:
       - template: templates/run-tests.yml
         parameters: