fixup! Update Variables to Generated Values

Author: sheylatrudo

.pipelines/build/binaries.jobs.yaml

@@ -13,22 +13,23 @@ jobs:
         type: linux
         ${{ if eq(job_data.job, 'linux_arm64') }}:
           hostArchitecture: arm64
+          vmImage: 'onebranch.azurecr.io/linux/ubuntu-2004-arm64:latest'
+        ${{ else }}:
+          vmImage: 'onebranch.azurecr.io/linux/ubuntu-2204:latest'
+
       variables:
         ob_outputDirectory: $(Build.ArtifactStagingDirectory)/out
         ob_artifactSuffix: _$(artifact)
         ob_git_checkout: false
         REPO_ROOT: $(Build.SourcesDirectory)/${{ job_data.templateContext.repositoryArtifact }}
         ${{ if eq(job_data.job, 'linux_amd64') }}:
-          LinuxContainerImage: $(LinuxContainerImage2)
           ARCH: amd64
           OS: linux
         ${{ elseif eq(job_data.job, 'windows_amd64') }}:
-          LinuxContainerImage: $(LinuxContainerImage2)
           ob_enable_qemu: true
           ARCH: amd64
           OS: windows
         ${{ elseif eq(job_data.job, 'linux_arm64') }}:
-          LinuxContainerImage: $(LinuxContainerImage3)
           ob_enable_qemu: true
           ARCH: arm64
           OS: linux

.pipelines/build/manifests.jobs.yaml

@@ -24,9 +24,8 @@ jobs:
     pool:
       type: docker
       os: linux
-      vmImage: $(LinuxContainerImage)
+      vmImage: 'mcr.microsoft.com/onebranch/azurelinux/build:3.0'
     variables:
-      LinuxContainerImage: $(LinuxContainerImage)
       ob_outputDirectory: $(Build.SourcesDirectory)/out
       ob_git_checkout: false
 

.pipelines/run-pipeline.yaml

@@ -114,6 +114,7 @@ stages:
       pool:
         os: linux
         type: docker
+        vmImage: 'onebranch.azurecr.io/linux/ubuntu-2204:latest'
       variables:
         ob_outputDirectory: $(Build.SourcesDirectory)/out
         ob_artifactSuffix: _$(name)_linux_amd64
@@ -174,6 +175,7 @@ stages:
       pool:
         os: linux
         type: docker
+        vmImage: 'onebranch.azurecr.io/linux/ubuntu-2204:latest'
       variables:
         ob_outputDirectory: $(Build.SourcesDirectory)/out
         ob_artifactSuffix: _$(name)_windows_amd64
@@ -193,28 +195,24 @@ stages:
             imageTag: $(Build.BuildNumber)
           cni:
             name: cni
-            osVersion: ltsc2022
             dockerfilePath: $(ACN_DIR)/cni
             extraArgs: '--build-arg CNI_AI_PATH=$(CNI_AI_PATH) --build-arg CNI_AI_ID=$(CNI_AI_ID)'
             archiveName: azure-cni
             archiveVersion: $(CNI_VERSION)
             imageTag: $(Build.BuildNumber)
           cns:
             name: cns
-            osVersion: ltsc2022
             dockerfilePath: $(ACN_DIR)/cns
             extraArgs: '--build-arg CNS_AI_PATH=$(CNS_AI_PATH) --build-arg CNS_AI_ID=$(CNS_AI_ID)'
             archiveName: azure-cns
             archiveVersion: $(CNS_VERSION)
             imageTag: $(Build.BuildNumber)
           npm:
             name: npm
-            osVersion: ltsc2022
             dockerfilePath: $(ACN_DIR)/npm-windows
             extraArgs: '--build-arg NPM_AI_PATH=$(NPM_AI_PATH) --build-arg NPM_AI_ID=$(NPM_AI_ID)'
             archiveName: azure-npm
             archiveVersion: $(NPM_VERSION)
-            # Note: Double check, I didn't notice a windows platform tag for npm in the Makefile
             imageTag: $(Build.BuildNumber)
       steps:
       - template: build/image.steps.yaml
@@ -233,10 +231,8 @@ stages:
         os: linux
         type: docker
         hostArchitecture: arm64
+        vmImage: 'onebranch.azurecr.io/linux/ubuntu-2004-arm64:latest'
       variables:
-        # Use if Mariner does not work.
-        # This agent has qemu enabled, so it should be ok.
-        #LinuxContainerImage: $(LinuxContainerImage3) 
         ob_outputDirectory: $(Build.SourcesDirectory)/out
         ob_artifactSuffix: _$(name)_linux_arm64
         ob_build_container: true