fixup! Separate Build Changes

Author: Sheyla Trudo

.pipelines/containers/containerize.jobs.yaml

@@ -0,0 +1,68 @@
+parameters:
+- name: supportedPlatforms
+  type: jobList
+  default: []
+
+- name: targetOs
+  type: string
+
+- name: targetArch
+  type: string
+
+
+jobs:
+- ${{ each supportedPlatformJob in parameters.supportedPlatforms }}:
+  - ${{ each imageName in supportedPlatformJob.images }}:
+    - job: ${{ replace(concat(imageName, '_', supportedPlatformJob.name), '-', '_') }}
+      displayName: Build Image - (${{ imageName }} ${{ parameters.targetOs }}/${{ parameters.targetArch }})
+      steps:
+      - checkout: self
+  
+      - task: GoTool@0
+        inputs:
+          version: $(GO_VERSION)
+  
+      - bash: |
+          set -e
+  
+          VAR_ID="${IMAGE}_${OS}_${ARCH}"
+  
+          BUILD_CONTEXT=$(make "$MAKE_BUILD_CONTEXT")
+          echo >&2 "##vso[task.setvariable variable=BUILD_CONTEXT_${VAR_ID};]$BUILD_CONTEXT"
+  
+          IMAGE_PLATFORM_TAG=$(make "$MAKE_IMAGE_TAG")
+          echo >&2 "##vso[task.setvariable variable=IMAGE_PLATFORM_TAG_${VAR_ID};]$IMAGE_PLATFORM_TAG"
+  
+          IMAGE_NAME_AND_TAG=$(make "$MAKE_IMAGE_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 Build Data"
+        env:
+          IMAGE: ${{ imageName }}
+          OS: ${{ parameters.targetOs }}
+          ARCH: ${{ parameters.targetArch }}
+          PLATFORM: ${{ parameters.targetOs }}/${{ parameters.targetArch }}
+          MAKE_IMAGE_TAG: ${{ imageName }}-image-tag
+          MAKE_BUILD_CONTEXT: ${{ imageName }}-image-build-context
+          MAKE_IMAGE_NAME_AND_TAG: ${{ imageName }}-image-name-and-tag
+          MAKE_DOCKERFILE_PATH: ${{ imageName }}-dockerfile-path
+          MAKE_EXTRA_BUILD_ARGS: ${{ imageName }}-docker-build-args
+  
+      - template: ./container-template.steps.yaml
+        parameters:
+          imageNameAndTag: $(IMAGE_NAME_AND_TAG_${{ imageName }}_${{ parameters.targetOs }}_${{ parameters.targetArch }})
+          dockerfilePath: $(DOCKERFILE_PATH_${{ imageName }}_${{ parameters.targetOs }}_${{ parameters.targetArch }})
+          buildContextPath: $(Build.SourcesDirectory)
+          targetVersion: $(IMAGE_PLATFORM_TAG_${{ imageName }}_${{ parameters.targetOs }}_${{ parameters.targetArch }})
+          targetOs: ${{ parameters.targetOs }}
+          targetArch: ${{ parameters.targetArch }}
+          targetPlatform: "${{ parameters.targetOs }}/${{ parameters.targetArch }}" 
+          addBuildArgs: $(EXTRA_BUILD_ARGS_${{ imageName }}_${{ parameters.targetOs }}_${{ parameters.targetArch }})
+          buildOs: ${{ supportedPlatformJob.templatContext.buildOs }}
+          buildArch: ${{ supportedPlatformJob.templateContext.buildArch }}
+          buildPlatform: "${{ supportedPlatformJob.templatContext.buildOs }}/${{ supportedPlatformJob.templateContext.buildArch }}"

.pipelines/run-pipeline.yaml

@@ -73,42 +73,48 @@ stages:
   dependsOn:
     - setup
     - test
-  templateContext:
-    buildArch: amd64
-    buildOs: linux
-    buildPlatform: linux/amd64
-    authenticatedContainerRegistries:
-    - serviceConnection: $(ACR_SERVICECONNECTION)
+  strategy:
+    matrix:
+      linux_amd64:
+        os: linux
+        arch: amd64
+        images:
+        - azure-ipam
+        - cni
+        - cns
+        - ipv6-hp-bpf
+        - npm
+      linux_arm64:
+        os: linux
+        arch: arm64
+        images:
+        - azure-ipam
+        - cni
+        - cns
+        - ipv6-hp-bpf
+        - npm
+      windows_amd64:
+        os: windows
+        arch: amd64
+        images:
+        - azure-ipam
+        - cni
+        - cns
+        - npm
   jobs:
-  - template: containers/container-template.jobs.yaml
+  - template: containerize.jobs.yaml
     parameters:
-      arch: amd64
-      os: linux
-      images:
-      - azure-ipam
-      - cni
-      - cns
-      - ipv6-hp-bpf
-      - npm
-  - template: containers/container-template.jobs.yaml
-    parameters:
-      arch: arm64
-      os: linux
-      images:
-      - azure-ipam
-      - cni
-      - cns
-      - ipv6-hp-bpf
-      - npm
-  - template: containers/container-template.jobs.yaml
-    parameters:
-      arch: amd64
-      os: windows
-      images:
-      - azure-ipam
-      - cni
-      - cns
-      - npm
+      targetOs: $(os)
+      targetArch: $(arch)
+      images: ${{ convertToJson(images) }}
+      supportedPlatforms:
+      - job: $(os)_$(arch)
+        templateContext:
+          buildArch: amd64
+          buildOs: linux
+          buildPlatform: linux/amd64
+          authenticatedContainerRegistries:
+          - serviceConnection: $(ACR_SERVICECONNECTION)
 
 
 - stage: publish