fixup! Clean up

Author: Sheyla Trudo

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

@@ -23,7 +23,7 @@ parameters:
 
 steps:
 
-- ${{ if eq(parameters.targetOs, 'linux') }}:
+#- ${{ if eq(parameters.targetOs, 'linux') }}:
   - bash: |
       set -e
   
@@ -55,42 +55,42 @@ steps:
       MAKE_DOCKERFILE_PATH: ${{ parameters.image }}-dockerfile-path
       MAKE_EXTRA_BUILD_ARGS: ${{ parameters.image }}-docker-build-args
 
-- ${{ elseif eq(parameters.targetOs, 'windows') }}:
-  - task: UsePythonVersion@0
-    inputs:
-      versionSpec: '3.x' # string. Required. Version spec. Default: 3.x.
-      addToPath: true # boolean. Add to PATH. Default: true.
-      architecture: 'x64'
-
-  - pwsh: |
-      $VAR_ID = '{0}_{1}_{2}' -f $env:IMAGE, $env:OS, $env:ARCH
-  
-      $BUILD_CONTEXT = (make "$env:MAKE_BUILD_CONTEXT")
-      Write-Host "##vso[task.setvariable variable=BUILD_CONTEXT_$VAR_ID;]$BUILD_CONTEXT"
-  
-      $IMAGE_PLATFORM_TAG = (make "$env:MAKE_IMAGE_TAG")
-      Write-Host "##vso[task.setvariable variable=IMAGE_PLATFORM_TAG_$VAR_ID;]$IMAGE_PLATFORM_TAG"
-  
-      $IMAGE_NAME_AND_TAG = (make "$env:MAKE_IMAGE_NAME_AND_TAG")
-      Write-Host "##vso[task.setvariable variable=IMAGE_NAME_AND_TAG_$VAR_ID;]$IMAGE_NAME_AND_TAG"
-  
-      $DOCKERFILE_PATH = (make "$env:MAKE_DOCKERFILE_PATH")
-      Write-Host "##vso[task.setvariable variable=DOCKERFILE_PATH_$VAR_ID;]$DOCKERFILE_PATH"
-  
-      $EXTRA_BUILD_ARGS = (make "$env:MAKE_EXTRA_BUILD_ARGS")
-      Write-Host "##vso[task.setvariable variable=EXTRA_BUILD_ARGS_$VAR_ID;]$EXTRA_BUILD_ARGS"
-    displayName: "Get Image Build Data"
-    errorActionPreference: stop
-    env:
-      CONTAINER_BUILDER: docker
-      CONTAINER_RUNTIME: docker
-      CONTAINER_TRANSPORT: docker  
-      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
+#- ${{ elseif eq(parameters.targetOs, 'windows') }}:
+#  - task: UsePythonVersion@0
+#    inputs:
+#      versionSpec: '3.x' # string. Required. Version spec. Default: 3.x.
+#      addToPath: true # boolean. Add to PATH. Default: true.
+#      architecture: 'x64'
+#
+#  - pwsh: |
+#      $VAR_ID = '{0}_{1}_{2}' -f $env:IMAGE, $env:OS, $env:ARCH
+#  
+#      $BUILD_CONTEXT = (make "$env:MAKE_BUILD_CONTEXT")
+#      Write-Host "##vso[task.setvariable variable=BUILD_CONTEXT_$VAR_ID;]$BUILD_CONTEXT"
+#  
+#      $IMAGE_PLATFORM_TAG = (make "$env:MAKE_IMAGE_TAG")
+#      Write-Host "##vso[task.setvariable variable=IMAGE_PLATFORM_TAG_$VAR_ID;]$IMAGE_PLATFORM_TAG"
+#  
+#      $IMAGE_NAME_AND_TAG = (make "$env:MAKE_IMAGE_NAME_AND_TAG")
+#      Write-Host "##vso[task.setvariable variable=IMAGE_NAME_AND_TAG_$VAR_ID;]$IMAGE_NAME_AND_TAG"
+#  
+#      $DOCKERFILE_PATH = (make "$env:MAKE_DOCKERFILE_PATH")
+#      Write-Host "##vso[task.setvariable variable=DOCKERFILE_PATH_$VAR_ID;]$DOCKERFILE_PATH"
+#  
+#      $EXTRA_BUILD_ARGS = (make "$env:MAKE_EXTRA_BUILD_ARGS")
+#      Write-Host "##vso[task.setvariable variable=EXTRA_BUILD_ARGS_$VAR_ID;]$EXTRA_BUILD_ARGS"
+#    displayName: "Get Image Build Data"
+#    errorActionPreference: stop
+#    env:
+#      CONTAINER_BUILDER: docker
+#      CONTAINER_RUNTIME: docker
+#      CONTAINER_TRANSPORT: docker  
+#      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

@@ -30,11 +30,11 @@ jobs:
       buildPlatform: ${{ parameters.buildOs }}/${{ parameters.buildArch }}
       targetPlatform: ${{ parameters.targetOs }}/${{ parameters.targetArch }}
 
-    ${{ if eq(parameters.targetOs, 'windows') }}:
-      pool:
-        name: $(BUILD_POOL_NAME_DEFAULT_WINDOWS)
-        os: windows
-        image: acn-runner-vmss-image-windows-1es-v2.0
+#    ${{ if eq(parameters.targetOs, 'windows') }}:
+#      pool:
+#        name: $(BUILD_POOL_NAME_DEFAULT_WINDOWS)
+#        os: windows
+#        image: acn-runner-vmss-image-windows-1es-v2.0
 
     steps:
     - checkout: self

.pipelines/containers/containerize.steps.yaml

@@ -43,7 +43,7 @@ steps:
     enableNetwork: true
     enablePull: false
     enableCache: true
-    useBuildKit: ${{ eq(parameters.targetOs, 'linux') }}
+    useBuildKit: true
 
 - task: 1ES.PushContainerImage@1
   condition: ${{ eq(parameters.targetOs, 'windows') }}