Testing default registry host value in pipeline

Author: micjustus-nc

.azuredevops/templates/steps/tf_plan.yaml

@@ -4,11 +4,6 @@ parameters:
   - name: tfCommandOptions
     type: string
     default: ''
-  - name: imageHash
-    type: string
-    default: ''
-  - name: registryHost
-    type: string
 
 steps:
   - template: tf_init.yaml
@@ -32,8 +27,8 @@ steps:
       commandOptions: >
         -input=false
         -var-file=$(tfVarsFile)
-        -var="image_commit_hash=${{ parameters.imageHash }}"
-        -var="registry_host=${{ parameters.registryHost }}"
+        -var="image_commit_hash=$(imageHash)"
+        -var="registry_host=$(registryHost)"
         ${{ parameters.tfCommandOptions }}
         -out=$(Build.ArtifactStagingDirectory)/$(ENVIRONMENT).tfplan
       environmentServiceNameAzureRM: $(SERVICE_CONNECTION)

.github/workflows/stage-3-build.yaml

@@ -64,7 +64,7 @@ jobs:
         with:
           repository: NHSDigital/dtos-devops-templates
           path: templates
-          ref: main
+          ref: feat/dtoss-9326-trigger-cd-pipeline-with-commit
 
       - name: Determine which Docker container(s) to build
         id: get-function-names
@@ -126,7 +126,7 @@ jobs:
         with:
           repository: NHSDigital/dtos-devops-templates
           path: templates
-          ref: main
+          ref: feat/dtoss-9326-trigger-cd-pipeline-with-commit
 
       - name: Build Docker image
         id: docker_image
@@ -151,23 +151,23 @@ jobs:
           [[ -n "${ENVIRONMENT_TAG}" ]] && docker tag "${image_lc}:latest" "${reg_image}:${ENVIRONMENT_TAG}"
 
       - name: AzureCLI login
-        if: (github.ref == 'refs/heads/main' && env.USE_AZURECR == 'true')
+        #if: (github.ref == 'refs/heads/main' && env.USE_AZURECR == 'true')
         uses: azure/login@v2
         with:
           client-id: ${{ secrets.AZURE_CLIENT_ID }}
           tenant-id: ${{ secrets.AZURE_TENANT_ID }}
           subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
 
       - name: ghcr.io login
-        if: (github.ref == 'refs/heads/main' && env.USE_AZURECR == 'false')
+        #if: (github.ref == 'refs/heads/main' && env.USE_AZURECR == 'false')
         uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ github.token }}
 
       - name: Push Docker image
-        if: github.ref == 'refs/heads/main'
+        #if: github.ref == 'refs/heads/main'
         working-directory: ${{ needs.containers-to-build.outputs.docker_compose_dir }}
         env:
           pr_num_tag: ${{ needs.containers-to-build.outputs.pr_num_tag }}
@@ -191,7 +191,7 @@ jobs:
 
   tag-all-repositories:
     name: Merge commit tag all images
-    if: github.ref == 'refs/heads/main'
+    #if: github.ref == 'refs/heads/main'
     runs-on: ubuntu-latest
     needs: [build-and-push, containers-to-build]
     env:
@@ -213,7 +213,7 @@ jobs:
         with:
           repository: NHSDigital/dtos-devops-templates
           path: templates
-          ref: main
+          ref: feat/dtoss-9326-trigger-cd-pipeline-with-commit
 
       - name: AzureCLI login
         if: env.USE_AZURECR == 'true'
@@ -235,7 +235,7 @@ jobs:
         env:
           container_registry: ${{ env.REGISTRY_HOST }}
           docker_services: >-
-            ${{ join(fromJSON(needs.containers-to-build.outputs.docker_services || '[]'), ',') }}
+            ${{ needs.containers-to-build.outputs.docker_services && join(fromJSON(needs.containers-to-build.outputs.docker_services || '[]'), ',') }}
         run: |
           echo Running 'docker buildx imagetools' on remote repositories...
 
@@ -261,15 +261,18 @@ jobs:
 
       - name: Call deployment pipeline
         if: success()
+        env:
+          container_registry: ${{ env.REGISTRY_HOST }}
         run: |
           az pipelines run \
-          --branch "main" \
+          --branch "feat/dtoss-9326-trigger-cd-pipeline-with-commit" \
           --name cd-infrastructure-dev-core \
           --org https://dev.azure.com/nhse-dtos \
           --project ${project_name} \
-          --parameters \
+          --variables \
               imageHash="${short_commit_hash}" \
-              registryHost="${REGISTRY_HOST}"
+              registryHost="${container_registry,,}"
+
 
   aggregate-reports:
     name: Aggregate reports