Merge pull request #489 from NHSDigital/master

Merge master into edge

Author: sophieclayton12-nhs

azure/common/apigee-build.yml

@@ -27,13 +27,19 @@ parameters:
   - name: cache_steps
     type: stepList
     default: []
+  - name: python_version
+    type: string
+    default: "3.8"
+  - name: agent_pool
+    type: string
+    default: "AWS-ECS"
 
 jobs:
   - job: build
     displayName: Build & Test
     timeoutInMinutes: 30
     pool:
-      name: 'AWS-ECS'
+      name: ${{ parameters.agent_pool }}
     workspace:
       clean: all
     variables:
@@ -138,9 +144,9 @@ jobs:
           service_name: "${{ parameters.service_name }}"
 
       - task: UsePythonVersion@0
-        displayName: "Use Python 3.8"
+        displayName: "Use Python ${{ parameters.python_version }}"
         inputs:
-          versionSpec: "3.8"
+          versionSpec: ${{ parameters.python_version }}
 
       - ${{ each cache_step in parameters.cache_steps }}:
           - ${{ cache_step }}

azure/common/apigee-deployment.yml

@@ -148,6 +148,12 @@ parameters:
     default: 'DEPRECATED'
   - name: spec_file
     default: 'DEPRECATED'
+  - name: python_version
+    type: string
+    default: "3.8"
+  - name: agent_pool
+    type: string
+    default: "AWS-ECS"
 
 
 extends:

azure/common/deploy-stage.yml

@@ -70,6 +70,10 @@ parameters:
       - config_ids
       - depends_on
       - jinja_templates
+  - name: python_version
+    type: string
+  - name: agent_pool
+    type: string
 
 stages:
   - stage: ${{ parameters.stage_name }}
@@ -78,7 +82,7 @@ stages:
       - deployment: deploy
         environment: ${{ parameters.environment }}
         pool:
-          name: 'AWS-ECS'
+          name: ${{ parameters.agent_pool }}
         workspace:
           clean: all
         strategy:
@@ -121,9 +125,9 @@ stages:
                     aws_account: "${{ parameters.aws_account }}"
 
                 - task: UsePythonVersion@0
-                  displayName: 'Use Python 3.8'
+                  displayName: "Use Python ${{ parameters.python_version }}"
                   inputs:
-                    versionSpec: 3.8
+                    versionSpec: ${{ parameters.python_version }}
 
                 - template: "../components/set-facts.yml"
                   parameters:

azure/common/deploy-stages.yml

@@ -14,7 +14,10 @@ parameters:
     type: string
   - name: prod_producer_approval
     type: boolean
-
+  - name: python_version
+    type: string
+  - name: agent_pool
+    type: string
 
 
 stages:

azure/common/pr.yml

@@ -55,6 +55,10 @@ parameters:
     default: '/_status'
   - name: manual_approval_env
     type: string
+  - name: python_version
+    type: string
+  - name: agent_pool
+    type: string
 
 stages:
   - ${{ if eq(parameters.environment, 'manual-approval') }}:

azure/common/release.yml

@@ -60,6 +60,10 @@ parameters:
   - name: producer_approval
     type: boolean
     default: false
+  - name: python_version
+    type: string
+  - name: agent_pool
+    type: string
 
 stages:
   - ${{ if eq(parameters.environment, 'manual-approval') }}: