fixup! Separate Build Changes

Author: Sheyla Trudo

.pipelines/containers/build-variables-template.steps.yaml

@@ -22,7 +22,7 @@ parameters:
 
 
 steps:
-- script: |
+- bash: |
     set -e
 
     VAR_ID="${IMAGE}_${OS}_${ARCH}"

.pipelines/containers/build-variables-template.windows.steps.yaml

@@ -0,0 +1,53 @@
+parameters:
+- name: targetOs
+  type: string
+  values:
+  - linux
+  - windows
+
+- name: targetArch
+  type: string
+  values:
+  - amd64
+  - arm64
+
+- name: image
+  type: string
+  values:
+  - azure-ipam
+  - cni
+  - cns
+  - ipv6-hp-bpf
+  - npm
+
+
+steps:
+- pwsh: |
+    $env:VAR_ID = "$env:IMAGE_$env:OS_$env:ARCH"
+
+    $env:BUILD_CONTEXT = (make "$env:MAKE_BUILD_CONTEXT")
+    Write-Host "##vso[task.setvariable variable=BUILD_CONTEXT_$env:VAR_ID;]$env:BUILD_CONTEXT"
+
+    $env:IMAGE_PLATFORM_TAG = (make "$env:MAKE_IMAGE_TAG")
+    Write-Host "##vso[task.setvariable variable=IMAGE_PLATFORM_TAG_$env:VAR_ID;]$env:IMAGE_PLATFORM_TAG"
+
+    $env:IMAGE_NAME_AND_TAG = (make "$env:MAKE_IMAGE_NAME_AND_TAG")
+    Write-Host "##vso[task.setvariable variable=IMAGE_NAME_AND_TAG_$env:VAR_ID;]$env:IMAGE_NAME_AND_TAG"
+
+    $env:DOCKERFILE_PATH = (make "$env:MAKE_DOCKERFILE_PATH")
+    Write-Host "##vso[task.setvariable variable=DOCKERFILE_PATH_$env:VAR_ID;]$env:DOCKERFILE_PATH"
+
+    $env:EXTRA_BUILD_ARGS = (make "$env:MAKE_EXTRA_BUILD_ARGS")
+    Write-Host "##vso[task.setvariable variable=EXTRA_BUILD_ARGS_$env:VAR_ID;]$env:EXTRA_BUILD_ARGS"
+  displayName: "Get Image Build Data"
+  errorActionPreference: stop
+  env:
+    IMAGE: ${{ parameters.image }}
+    OS: ${{ parameters.targetOs }}
+    ARCH: ${{ parameters.targetArch }}
+    PLATFORM: ${{ parameters.targetOs }}/${{ parameters.targetArch }}
+    MAKE_IMAGE_TAG: ${{ parameters.image }}-image-tag
+    MAKE_BUILD_CONTEXT: ${{ parameters.image }}-image-build-context
+    MAKE_IMAGE_NAME_AND_TAG: ${{ parameters.image }}-image-name-and-tag
+    MAKE_DOCKERFILE_PATH: ${{ parameters.image }}-dockerfile-path
+    MAKE_EXTRA_BUILD_ARGS: ${{ parameters.image }}-docker-build-args

.pipelines/containers/containerize.jobs.yaml

@@ -32,10 +32,6 @@ parameters:
   - amd64
   - arm64
 
-- name: buildVariablesStepTemplate
-  type: string
-  default: ''
-
 
 jobs:
 - ${{ each imageName in parameters.images }}:
@@ -58,27 +54,33 @@ jobs:
       inputs:
         version: $(GO_VERSION)
 
-
     # Requires creation of the following variables:
     # - IMAGE_NAME_AND_TAG_${image}_${OS}_${ARCH}}
     # - DOCKERFILE_PATH_${image}_${OS}_${ARCH}}
+    # - BUILD_CONTEXT_${image}_${OS}_${ARCH}}
     # - IMAGE_PLATFORM_TAG_${image}_${OS}_${ARCH}}
     # - EXTRA_BUILD_ARGS_$${image}_${OS}_${ARCH}}
     - ${{ if parameters.buildVariablesStepTemplate }}:
-      - template: ${{ parameters.buildVariablesStepTemplate }}
-        parameters:
-          targetOs: ${{ parameters.targetOs }}
-          targetArch: ${{ parameters.targetArch }}
-          image: ${{ imageName }}
-
+      - ${{ if eq(parameters.targetOs, 'windows') }}:
+        - template: /.pipelines/containers/build-variables-template.windows.steps.yaml
+          parameters:
+            targetOs: ${{ parameters.targetOs }}
+            targetArch: ${{ parameters.targetArch }}
+            image: ${{ imageName }}
+       - ${{ else }}:
+        - template: /.pipelines/containers/build-variables-template.steps.yaml
+          parameters:
+            targetOs: ${{ parameters.targetOs }}
+            targetArch: ${{ parameters.targetArch }}
+            image: ${{ imageName }}
 
     - 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)
+        buildContextPath: $(BUILD_CONTEXT_${{ imageName }}_${{ parameters.targetOs }}_${{ parameters.targetArch }})
         targetVersion: $(IMAGE_PLATFORM_TAG_${{ imageName }}_${{ parameters.targetOs }}_${{ parameters.targetArch }})
+        addBuildArgs: $(EXTRA_BUILD_ARGS_${{ imageName }}_${{ parameters.targetOs }}_${{ parameters.targetArch }})
         targetPlatform: $(targetPlatform)
         targetArch: ${{ parameters.targetArch }}
         targetOs: ${{ parameters.targetOs }}
-        addBuildArgs: $(EXTRA_BUILD_ARGS_${{ imageName }}_${{ parameters.targetOs }}_${{ parameters.targetArch }})

.pipelines/run-pipeline.yaml

@@ -87,7 +87,6 @@ stages:
       - cns
       - ipv6-hp-bpf
       - npm
-      buildVariablesStepTemplate: /.pipelines/containers/build-variables-template.steps.yaml
   - template: containers/containerize.jobs.yaml
     parameters:
       targetOs: linux
@@ -98,7 +97,6 @@ stages:
       - cns
       - ipv6-hp-bpf
       - npm
-      buildVariablesStepTemplate: /.pipelines/containers/build-variables-template.steps.yaml
   - template: containers/containerize.jobs.yaml
     parameters:
       targetOs: windows
@@ -108,7 +106,6 @@ stages:
       - cni
       - cns
       - npm
-      buildVariablesStepTemplate: /.pipelines/containers/build-variables-template.steps.yaml
 
 
 - stage: publish