fixup! Separate Build Changes

Author: Sheyla Trudo

.pipelines/containers/container-template.jobs.yaml

@@ -8,41 +8,55 @@ parameters:
 - name: images
   type: object
 
+- name: pushAcr
+  type: string
+
 
 jobs:
 - ${{ each image in split(parameters.images, '\n') }}:
   - job: ${{ image }}_${{ parameters.os }}_${{ parameters.arch }}
     displayName: Build Image - (${{ image }} ${{ parameters.os }}/${{ parameters.arch }})
-  
+
     steps:
-      - task: GoTool@0
-        inputs:
-          version: $(GO_VERSION)
-
-      - bash: |
-          set -e
-      
-          BUILD_CONTEXT=$(make "$MAKE_BUILD_CONTEXT")
-          echo >&2 "##vso[task.setvariable variable=BUILD_CONTEXT_${VAR_ID};]$BUILD_CONTEXT"
-      
-          IMAGE_NAME_AND_TAG=$(make "$MAKE_IMG_NAME_AND_TAG")
-          echo >&2 "##vso[task.setvariable variable=IMAGE_NAME_AND_TAG_${VAR_ID};]$IMAGE_NAME_AND_TAG"
-      
-          DOCKERFILE_PATH=$(make "$MAKE_DOCKERFILE_PATH")
-          echo >&2 "##vso[task.setvariable variable=DOCKERFILE_PATH_${VAR_ID};]$DOCKERFILE_PATH"
-      
-          EXTRA_BUILD_ARGS=$(make "$MAKE_EXTRA_BUILD_ARGS")
-          echo >&2 "##vso[task.setvariable variable=EXTRA_BUILD_ARGS_${VAR_ID};]$EXTRA_BUILD_ARGS"
-        displayName: "Get Image Name"
-        env:
-          VAR_ID: ${{ parameters.name }}
-          MAKE_BUILD_CONTEXT: ${{ parameters.name }}-image-build-context
-          MAKE_IMG_NAME_AND_TAG: ${{ parameters.name }}-image-name-and-tag
-          MAKE_DOCKERFILE_PATH: ${{ parameters.name }}-image-dockerfile-path
-          MAKE_EXTRA_BUILD_ARGS: ${{ parameters.name }}-image-build-args
-
-      - template: containers/container-template.steps.yaml
-        parameters:
-          arch: ${{ parameters.arch }}
-          name: ${{ parameters.name }}
-          os: ${{ parameters.os }}
+    - task: GoTool@0
+      inputs:
+        version: $(GO_VERSION)
+
+    - task: AzureCLI@2
+      inputs:
+        azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
+        scriptLocation: "inlineScript"
+        scriptType: "bash"
+        addSpnToEnvironment: true
+        inlineScript: |
+          az acr login --name "$ACR"
+      env:
+        ACR: ${{ parameters.pushAcr }}
+
+    - bash: |
+        set -e
+
+        BUILD_CONTEXT=$(make "$MAKE_BUILD_CONTEXT")
+        echo >&2 "##vso[task.setvariable variable=BUILD_CONTEXT_${VAR_ID};]$BUILD_CONTEXT"
+
+        IMAGE_NAME_AND_TAG=$(make "$MAKE_IMG_NAME_AND_TAG")
+        echo >&2 "##vso[task.setvariable variable=IMAGE_NAME_AND_TAG_${VAR_ID};]$IMAGE_NAME_AND_TAG"
+
+        DOCKERFILE_PATH=$(make "$MAKE_DOCKERFILE_PATH")
+        echo >&2 "##vso[task.setvariable variable=DOCKERFILE_PATH_${VAR_ID};]$DOCKERFILE_PATH"
+
+        EXTRA_BUILD_ARGS=$(make "$MAKE_EXTRA_BUILD_ARGS")
+        echo >&2 "##vso[task.setvariable variable=EXTRA_BUILD_ARGS_${VAR_ID};]$EXTRA_BUILD_ARGS"
+      displayName: "Get Image Name"
+      env:
+        VAR_ID: ${{ parameters.name }}
+        MAKE_BUILD_CONTEXT: ${{ parameters.name }}-image-build-context
+        MAKE_IMG_NAME_AND_TAG: ${{ parameters.name }}-image-name-and-tag
+        MAKE_DOCKERFILE_PATH: ${{ parameters.name }}-image-dockerfile-path
+        MAKE_EXTRA_BUILD_ARGS: ${{ parameters.name }}-image-build-args
+
+    - template: containers/container-template.steps.yaml
+      parameters:
+        arch: ${{ parameters.arch }}
+        name: ${{ parameters.name }}
+        os: ${{ parameters.os }}

.pipelines/templates/add-windows-nodepool-job.yaml

@@ -22,7 +22,7 @@ jobs:
         addSpnToEnvironment: true
         inlineScript: |
           set -e
-          
+
           windows_nodepool=$(az aks nodepool list \
           --resource-group ${{ parameters.clusterName }} \
           --cluster-name ${{ parameters.clusterName }} \
@@ -38,7 +38,7 @@ jobs:
               --name "${{ parameters.clusterName }}" \
               --resource-group "${{ parameters.clusterName }}" \
               --query provisioningState)
-              
+
               if echo "$cluster_state" | grep -q "Updating"; then
                 echo "Cluster is updating. Sleeping for 30 seconds..."
                 sleep 30