Fix azure pipeline to newer image (#4283)

* fix azure pipeline to newer image

* use local variable

* use 'variables'

* pass image name as parameter

* override container name conversion

* Move Windows containers too

* Fix PR too

* Try different syntax

* hard code

* Create a default container too

* Change syntax back

* Updated OneBranch.Official.yml

---------

Co-authored-by: Nick Banks <nibanks@microsoft.com>

.azure/OneBranch.Official.yml

@@ -40,11 +40,6 @@ variables:
   NUGET_XMLDOC_MODE: none
   ONEBRANCH_AME_ACR_LOGIN: onebranch.azurecr.io, cdpxb7b51c2f738e43e48f7605d9a8e5f6d700.azurecr.io
 
-  WindowsContainerImage: 'onebranch.azurecr.io/windows/ltsc2022/vse2022:latest'
-  WindowsContainerImage2: 'cdpxb7b51c2f738e43e48f7605d9a8e5f6d700.azurecr.io/b7b51c2f-738e-43e4-8f76-05d9a8e5f6d7/official/msquicbuild:${{ parameters.WindowsContainerImage2DockerTag }}'
-  LinuxContainerImage: 'ghcr.io/microsoft/msquic/linux-build-xcomp:22.04'
-  LinuxContainerImage2: 'ghcr.io/microsoft/msquic/linux-build-xcomp:20.04'
-
 resources:
   repositories:
     - repository: templates
@@ -73,6 +68,28 @@ extends:
     featureFlags:
       linuxEsrpSigningPreview: true
       WindowsHostVersion: '1ESWindows2022'
+    containers:
+      - container: windows_build_container
+        image: 'onebranch.azurecr.io/windows/ltsc2022/vse2022:latest'
+        type: Windows
+      - container: windows_build_container2
+        image: 'cdpxb7b51c2f738e43e48f7605d9a8e5f6d700.azurecr.io/b7b51c2f-738e-43e4-8f76-05d9a8e5f6d7/official/msquicbuild:${{ parameters.WindowsContainerImage2DockerTag }}'
+        type: Windows
+      - container: linux_build_container # Default container
+        image: 'ghcr.io/microsoft/msquic/linux-build-xcomp:ubuntu-20.04-x86_64'
+        type: Linux
+      - container: ubuntu_2004_x86_64
+        image: 'ghcr.io/microsoft/msquic/linux-build-xcomp:ubuntu-20.04-x86_64'
+        type: Linux
+      - container: ubuntu_2004_arm
+        image: 'ghcr.io/microsoft/msquic/linux-build-xcomp:ubuntu-20.04-arm'
+        type: Linux
+      - container: ubuntu_2204_x86_64
+        image: 'ghcr.io/microsoft/msquic/linux-build-xcomp:ubuntu-22.04-x86_64'
+        type: Linux
+      - container: ubuntu_2204_arm
+        image: 'ghcr.io/microsoft/msquic/linux-build-xcomp:ubuntu-22.04-arm'
+        type: Linux
 
     stages:
     - stage: build_winkernel

.azure/OneBranch.PullRequest.yml

@@ -37,11 +37,6 @@ variables:
   NUGET_XMLDOC_MODE: none
   ONEBRANCH_AME_ACR_LOGIN: onebranch.azurecr.io, cdpxb7b51c2f738e43e48f7605d9a8e5f6d700.azurecr.io
 
-  WindowsContainerImage: 'onebranch.azurecr.io/windows/ltsc2022/vse2022:latest'
-  WindowsContainerImage2: 'cdpxb7b51c2f738e43e48f7605d9a8e5f6d700.azurecr.io/b7b51c2f-738e-43e4-8f76-05d9a8e5f6d7/official/msquicbuild:${{ parameters.WindowsContainerImage2DockerTag }}'
-  LinuxContainerImage: 'ghcr.io/microsoft/msquic/linux-build-xcomp:22.04'
-  LinuxContainerImage2: 'ghcr.io/microsoft/msquic/linux-build-xcomp:20.04'
-
 resources:
   repositories:
     - repository: templates
@@ -69,6 +64,28 @@ extends:
         suppressionFile: $(Build.SourcesDirectory)\.azure\openssl.gdnsuppress
     featureFlags:
       WindowsHostVersion: '1ESWindows2022'
+    containers:
+      - container: windows_build_container
+        image: 'onebranch.azurecr.io/windows/ltsc2022/vse2022:latest'
+        type: Windows
+      - container: windows_build_container2
+        image: 'cdpxb7b51c2f738e43e48f7605d9a8e5f6d700.azurecr.io/b7b51c2f-738e-43e4-8f76-05d9a8e5f6d7/official/msquicbuild:${{ parameters.WindowsContainerImage2DockerTag }}'
+        type: Windows
+      - container: linux_build_container # Default container
+        image: 'ghcr.io/microsoft/msquic/linux-build-xcomp:ubuntu-20.04-x86_64'
+        type: Linux
+      - container: ubuntu_2004_x86_64
+        image: 'ghcr.io/microsoft/msquic/linux-build-xcomp:ubuntu-20.04-x86_64'
+        type: Linux
+      - container: ubuntu_2004_arm
+        image: 'ghcr.io/microsoft/msquic/linux-build-xcomp:ubuntu-20.04-arm'
+        type: Linux
+      - container: ubuntu_2204_x86_64
+        image: 'ghcr.io/microsoft/msquic/linux-build-xcomp:ubuntu-22.04-x86_64'
+        type: Linux
+      - container: ubuntu_2204_arm
+        image: 'ghcr.io/microsoft/msquic/linux-build-xcomp:ubuntu-22.04-arm'
+        type: Linux
 
     stages:
     - stage: build_winkernel

.azure/obtemplates/build-linux.yml

@@ -16,9 +16,9 @@ jobs:
   - task: PowerShell@2
     displayName: Prepare Build Machine
     ${{ if eq(parameters.tls, 'openssl') }}:
-      target: linux_build_container2
+      target: ubuntu_2004_x86_64
     ${{ else }}:
-      target: linux_build_container
+      target: ubuntu_2204_x86_64
     inputs:
       pwsh: true
       filePath: scripts/prepare-machine.ps1
@@ -26,9 +26,9 @@ jobs:
   - task: PowerShell@2
     displayName: x64
     ${{ if eq(parameters.tls, 'openssl') }}:
-      target: linux_build_container2
+      target: ubuntu_2004_x86_64
     ${{ else }}:
-      target: linux_build_container
+      target: ubuntu_2204_x86_64
     inputs:
       pwsh: true
       filePath: scripts/build.ps1
@@ -36,9 +36,9 @@ jobs:
   - task: PowerShell@2
     displayName: arm64
     ${{ if eq(parameters.tls, 'openssl') }}:
-      target: linux_build_container2
+      target: ubuntu_2004_arm
     ${{ else }}:
-      target: linux_build_container
+      target: ubuntu_2204_arm
     inputs:
       pwsh: true
       filePath: scripts/build.ps1
@@ -46,9 +46,9 @@ jobs:
   - task: PowerShell@2
     displayName: arm
     ${{ if eq(parameters.tls, 'openssl') }}:
-      target: linux_build_container2
+      target: ubuntu_2004_arm
     ${{ else }}:
-      target: linux_build_container
+      target: ubuntu_2204_arm
     inputs:
       pwsh: true
       filePath: scripts/build.ps1