fixup! Separate Build Changes

Author: Sheyla Trudo

.pipelines/containers/containerize.jobs.yaml

@@ -10,6 +10,23 @@ parameters:
   type: string
 
 
+- name: buildPlatform
+  type: string
+  default: ''
+
+- name: buildOs
+  type: string
+  values:
+  - linux
+  - windows
+
+- name: buildArch
+  type: string
+  values:
+  - amd64
+  - arm64
+
+
 jobs:
 - ${{ each supportedPlatformJob in parameters.supportedPlatforms }}:
   - ${{ each imageName in supportedPlatformJob.images }}:

.pipelines/run-pipeline.yaml

@@ -73,48 +73,45 @@ stages:
   dependsOn:
     - setup
     - test
-  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
+  templateContext:
+    authenticatedContainerRegistries:
+    - serviceConnection: $(ACR_SERVICECONNECTION)
   jobs:
   - template: containerize.jobs.yaml
     parameters:
-      targetOs: $(os)
-      targetArch: $(arch)
-      images: ${{ convertToJson(images) }}
+      buildArch: amd64
+      buildOs: linux
+      buildPlatform: linux/amd64
       supportedPlatforms:
-      - job: $(os)_$(arch)
-        templateContext:
-          buildArch: amd64
-          buildOs: linux
-          buildPlatform: linux/amd64
-          authenticatedContainerRegistries:
-          - serviceConnection: $(ACR_SERVICECONNECTION)
+      - template: ./containers/containerize.jobs.yaml
+        parameters:
+          targetOs: linux
+          targetArch: amd64
+          images:
+          - azure-ipam
+          - cni
+          - cns
+          - ipv6-hp-bpf
+          - npm
+      - template: ./containers/containerize.jobs.yaml
+        parameters:
+          targetOs: linux
+          targetArch: arm64
+          images:
+          - azure-ipam
+          - cni
+          - cns
+          - ipv6-hp-bpf
+          - npm
+      - template: ./containers/containerize.jobs.yaml
+        parameters:
+          targetOs: windows
+          targetArch: amd64
+          images:
+          - azure-ipam
+          - cni
+          - cns
+          - npm
 
 
 - stage: publish