Merge pull request #100 from hmcts/adotrigger

Use ADO Trigger v1 and apply to release pipeline

Author: duncancrawford

.github/workflows/ci-draft.yml

@@ -134,7 +134,7 @@ jobs:
           echo "REPO_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
 
       - name: Trigger ADO pipeline
-        uses: hmcts/trigger-ado-pipeline@v1.0.3
+        uses: hmcts/trigger-ado-pipeline@v1
         with:
           pipeline_id: 460 #cp-gh-artifact-to-acr
           ado_pat: ${{ secrets.HMCTS_ADO_PAT }}

.github/workflows/ci-released.yml

@@ -113,35 +113,23 @@ jobs:
   Deploy:
     needs: [ Build, Artefact-Version ]
     runs-on: ubuntu-latest
+    if: github.event_name == 'push'
 
     steps:
-      - name: Trigger ADO pipeline
-        env:
-          ADO_ORG: 'hmcts-cpp'
-          ADO_PROJECT: 'cpp-apps'
-          PIPELINE_ID: 460 #cp-gh-artifact-to-acr
-          ADO_PAT: ${{ secrets.HMCTS_ADO_PAT }}
-          ARTEFACT_VERSION: ${{ needs.Artefact-Version.outputs.artefact_version }}
+      - name: Extract repo name
+        id: extract_repo
         run: |
-          REPO_NAME="${GITHUB_REPOSITORY##*/}"
-          TARGET_REPOSITORY="${GITHUB_REPOSITORY}"
-
-          curl -X POST \
-            -u ":${ADO_PAT}" \
-            -H "Content-Type: application/json" \
-            https://dev.azure.com/${ADO_ORG}/${ADO_PROJECT}/_apis/pipelines/${PIPELINE_ID}/runs?api-version=7.0 \
-            -d "{
-              \"resources\": {
-                \"repositories\": {
-                  \"self\": {
-                    \"refName\": \"refs/heads/main\"
-                  }
-                }
-              },
-              \"templateParameters\": {
-                \"GROUP_ID\": \"uk.gov.hmcts.cp\",
-                \"ARTIFACT_ID\": \"${REPO_NAME}\",
-                \"ARTIFACT_VERSION\": \"${ARTEFACT_VERSION}\",
-                \"TARGET_REPOSITORY\": \"${TARGET_REPOSITORY}\"
-              }
-            }"
+          echo "REPO_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
+
+      - name: Trigger ADO pipeline
+        uses: hmcts/trigger-ado-pipeline@v1
+        with:
+          pipeline_id: 460 #cp-gh-artifact-to-acr
+          ado_pat: ${{ secrets.HMCTS_ADO_PAT }}
+          template_parameters: >
+            {
+              "GROUP_ID": "uk.gov.hmcts.cp",
+              "ARTIFACT_ID": "${{ env.REPO_NAME }}",
+              "ARTIFACT_VERSION": "${{ needs.Artefact-Version.outputs.artefact_version }}",
+              "TARGET_REPOSITORY": "${{ github.repository }}"
+            }