Refactoring

Author: robertnovac1

azure/new_pipelines/apigee-deployment.yml

@@ -4,32 +4,23 @@ parameters:
   - name: tf_dir
     type: string
 
-trigger: none
-pr: none
-
-resources:
-  repositories:
-    - repository: common
-      type: github
-      name: NHSDigital/api-management-utils
-      ref: refs/heads/edge
-      endpoint: NHSDigital
-      
-pool:
-  name: 'AWS-ECS'
-
-extends:
-  template: azure/common/apigee-deployment.yml@common
-  parameters:
-    service_name: immunisation-fhir-api
-    short_service_name: ifa
-    service_base_path: immunisation-fhir-api/FHIR/R4
-    apigee_deployments:
-      - environment: internal-dev
-        jinja_templates:
-          DOMAIN_ENDPOINT: https://green.imms.int.vds.platform.nhs.uk
-        post_deploy:
-          - template: ./post-apigee-deployment.yml
-            parameters:
-              tf_dir: ${{ parameters.tf_dir }}
-              tf_environment: ${{ parameters.tf_environment }}
+jobs:
+  - job: apigee_deploy
+    displayName: Deploy Apigee (${{ parameters.tf_environment }})
+    pool:
+      name: 'AWS-ECS'
+    steps:
+      - template: azure/common/apigee-deployment.yml@common
+        parameters:
+          service_name: immunisation-fhir-api
+          short_service_name: ifa
+          service_base_path: immunisation-fhir-api/FHIR/R4
+          apigee_deployments:
+            - environment: internal-dev
+              jinja_templates:
+                DOMAIN_ENDPOINT: https://green.imms.int.vds.platform.nhs.uk
+              post_deploy:
+                - template: ./post-apigee-deployment.yml
+                  parameters:
+                    tf_dir: ${{ parameters.tf_dir }}
+                    tf_environment: ${{ parameters.tf_environment }}

azure/new_pipelines/azure-pr-blue-green-root.yml

@@ -1,6 +1,17 @@
 trigger: none
 pr: none
 
+resources:
+  repositories:
+    - repository: common
+      type: github
+      name: NHSDigital/api-management-utils
+      ref: refs/heads/edge
+      endpoint: NHSDigital
+
+pool:
+  name: 'AWS-ECS'
+
 stages:
   - stage: GreenDeploy
     displayName: "Deploy to Green"
@@ -9,6 +20,7 @@ stages:
         parameters:
           tf_environment: green
           tf_dir: "terraform_old"
+          
   # - stage: BlueDeploy
   #   displayName: "Deploy to Blue"
   #   dependsOn: GreenDeploy