APM-1216 Use runtime expression and add release deployments

HenryIwanejko · HenryIwanejko · commit 75ebe09e2af8 · 2021-02-10T15:06:43.000Z
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -20,3 +20,13 @@ jobs:
         echo BRANCH_NAME=${BRANCH_NAME}
         echo NOTIFY_COMMIT_SHA=${NOTIFY_COMMIT_SHA}
         python3 scripts/test_pull_request_deployments.py
+
+    - name: Test Release Deployments
+      env:
+        AZURE_TOKEN: "${{ secrets.AZURE_TOKEN }}"
+      run: |
+        export BRANCH_NAME="${{ github.event.pull_request.head.ref }}"
+        export NOTIFY_COMMIT_SHA="${{ github.event.pull_request.head.sha }}"
+        echo BRANCH_NAME=${BRANCH_NAME}
+        echo NOTIFY_COMMIT_SHA=${NOTIFY_COMMIT_SHA}
+        python3 scripts/test_release_deployments.py
diff --git a/azure/common/apigee-deployment.yml b/azure/common/apigee-deployment.yml
@@ -142,7 +142,8 @@ extends:
       ${{ if notIn(param.key, 'apigee_deployments', '_scoped_pipeline_vars', '_scoped_step_list_vars', '_pipeline_defaults') }}:
         ${{ if not(contains(join(',', parameters._scoped_pipeline_vars), param.key)) }}:
           ${{ param.key }}: ${{ param.value }}
-    utils_pr_number: $(UTILS_PR_NUMBER)
+    # Exists if triggered from a utils pull_request
+    utils_pr_number: $[variables.UTILS_PR_NUMBER]
 
     ${{ each pipeline_default in parameters._pipeline_defaults }}:
       ${{ if endsWith(variables['Build.DefinitionName'], pipeline_default.name_suffix) }}:
diff --git a/scripts/trigger_pipelines.py b/scripts/trigger_pipelines.py
@@ -10,7 +10,6 @@ def __init__(self, utils_pr_number: int = None):
         self.base_url = "https://dev.azure.com/NHSD-APIM/API Platform/_apis/pipelines"
         self.token = os.environ["AZURE_TOKEN"]
         self.auth = requests.auth.HTTPBasicAuth("", self.token)
-        self.branch_name = os.environ["BRANCH_NAME"]
         self.notify_commit_sha = os.environ["NOTIFY_COMMIT_SHA"]
         self.utils_pr_number = utils_pr_number
         self.notify_github_repo = "NHSDigital/api-management-utils"
