NHSDigital · acarriedev · Jul 26, 2021 · Jul 20, 2021 · Jul 20, 2021 · Jul 20, 2021
diff --git a/azure/common/apigee-deployment.yml b/azure/common/apigee-deployment.yml
@@ -94,6 +94,10 @@ parameters:
     displayName: Requires manual approval
     type: boolean
     default: true
+  - name: manual_approval_env
+    displayName: Custom manual approval env overwrite
+    type: string
+    default: 'manual-approval'
   - name: _scoped_pipeline_vars
     type: object
     displayName: All the pipeline parameters which support per-environment scoping.
@@ -166,6 +170,7 @@ extends:
                 - environment: manual-approval
                   stage_name: manual_approval
                   depends_on: []
+                  manual_approval_prod: true
                   ${{ each var in parameters._scoped_pipeline_vars }}:
                       ${{ var }}: ${{ parameters[var] }}
             - ${{ each apigee_deployment in parameters.apigee_deployments }}:

diff --git a/azure/common/deploy-manual-approval.yml b/azure/common/deploy-manual-approval.yml
@@ -2,16 +2,19 @@ parameters:
   - name: stage_name
   - name: depends_on
     type: object
+  - name: manual_approval_env
+    type: string
 
 stages:
   - stage: ${{ parameters.stage_name }}
     dependsOn: ${{ parameters.depends_on }}
     jobs:
       - deployment: deploy
         displayName: Manual Approval Required
+        timeoutInMinutes: 60
         pool:
           vmImage: "Ubuntu-16.04"
-        environment: "manual-approval"
+        environment: ${{ parameters.manual_approval_env }}
         strategy:
           runOnce:
             deploy:

diff --git a/azure/common/deploy-stages.yml b/azure/common/deploy-stages.yml
@@ -11,6 +11,8 @@ parameters:
     type: boolean
   - name: deploy_template
   - name: prod_requires_approval
+  - name: manual_approval_env
+    type: string
 
 
 stages:

diff --git a/azure/common/pr.yml b/azure/common/pr.yml
@@ -4,6 +4,7 @@ parameters:
     values:
       - internal-dev
       - internal-dev-sandbox
+      - manual-approval
   - name: apigee_organization
   - name: aws_account
   - name: stage_name
@@ -54,17 +55,25 @@ parameters:
   - name: hosted_target_healthcheck_suffix
     type: string
     default: ''
-
+  - name: manual_approval_env
+    type: string
 
 stages:
-  - template: ./deploy-stage.yml
-    parameters:
-      ${{ if eq(parameters.proxy_path, 'live')}}:
-        fully_qualified_service_name: ${{ parameters.service_name }}-${{ parameters.pr_label }}
-      ${{ if ne(parameters.proxy_path, 'live')}}:
-        fully_qualified_service_name: ${{ parameters.service_name }}-${{ parameters.pr_label }}-${{ parameters.proxy_path }}
-      service_base_path: ${{ parameters.service_base_path }}-${{ parameters.pr_label }}
-      notify: true
-      ${{ each param in parameters }}:
-        ${{ if notIn(param.key, 'deploy_review_sandbox', 'fully_qualified_service_name', 'service_base_path') }}:
-          ${{ param.key }}: ${{ param.value }}
+  - ${{ if eq(parameters.environment, 'manual-approval') }}:
+    - template: ./deploy-manual-approval.yml
+      parameters:
+        stage_name: ${{ parameters.stage_name }}
+        depends_on: ${{ parameters.depends_on }}
+        manual_approval_env: ${{ parameters.manual_approval_env }}
+  - ${{ if not(eq(parameters.environment, 'manual-approval')) }}:
+    - template: ./deploy-stage.yml
+      parameters:
+        ${{ if eq(parameters.proxy_path, 'live')}}:
+          fully_qualified_service_name: ${{ parameters.service_name }}-${{ parameters.pr_label }}
+        ${{ if ne(parameters.proxy_path, 'live')}}:
+          fully_qualified_service_name: ${{ parameters.service_name }}-${{ parameters.pr_label }}-${{ parameters.proxy_path }}
+        service_base_path: ${{ parameters.service_base_path }}-${{ parameters.pr_label }}
+        notify: true
+        ${{ each param in parameters }}:
+          ${{ if notIn(param.key, 'deploy_review_sandbox', 'fully_qualified_service_name', 'service_base_path', 'manual_approval_env') }}:
+            ${{ param.key }}: ${{ param.value }}
diff --git a/azure/common/release.yml b/azure/common/release.yml
@@ -54,13 +54,22 @@ parameters:
     type: boolean
   - name: enable_status_monitoring
     type: boolean
+  - name: manual_approval_env
+    type: string
+  - name: manual_approval_prod
+    type: boolean
+    default: false
 
 stages:
   - ${{ if eq(parameters.environment, 'manual-approval') }}:
     - template: ./deploy-manual-approval.yml
       parameters:
         stage_name: ${{ parameters.stage_name }}
         depends_on: ${{ parameters.depends_on }}
+        ${{ if eq(true, parameters.manual_approval_prod) }}:
+          manual_approval_env: manual-approval-prod
+        ${{ if eq(false, parameters.manual_approval_prod) }}:
+          manual_approval_env: ${{ parameters.manual_approval_env }}
   - ${{ if not(eq(parameters.environment, 'manual-approval')) }}:
     - template: ./deploy-stage.yml
       parameters:
@@ -69,5 +78,5 @@ stages:
         ${{ if ne('', parameters.fully_qualified_service_name) }}:
           fully_qualified_service_name: ${{ parameters.fully_qualified_service_name }}
         ${{ each param in parameters }}:
-          ${{ if notIn(param.key, 'fully_qualified_service_name') }}:
+          ${{ if notIn(param.key, 'fully_qualified_service_name', 'manual_approval_env', 'manual_approval_prod') }}:
             ${{ param.key }}: ${{ param.value }}