diff --git a/eng/docker-tools/templates/stages/dotnet/build-and-test.yml b/eng/docker-tools/templates/stages/dotnet/build-and-test.yml index 311b1613..8424f3f9 100644 --- a/eng/docker-tools/templates/stages/dotnet/build-and-test.yml +++ b/eng/docker-tools/templates/stages/dotnet/build-and-test.yml @@ -70,7 +70,9 @@ stages: ${{ if ne(parameters.linuxAmd64Pool, '') }}: ${{ parameters.linuxAmd64Pool }} ${{ elseif eq(variables['System.TeamProject'], parameters.publicProjectName) }}: - vmImage: $(defaultLinuxAmd64PoolImage) + name: $(linuxAmd64PublicPoolName) + demands: ImageOverride -equals $(linuxAmd64PublicPoolImage) + os: linux ${{ elseif eq(variables['System.TeamProject'], parameters.internalProjectName) }}: name: $(linuxAmd64InternalPoolName) image: $(linuxAmd64InternalPoolImage) @@ -80,21 +82,23 @@ stages: linuxArm64Pool: os: linux hostArchitecture: Arm64 - image: $(linuxArm64PoolImage) ${{ if eq(variables['System.TeamProject'], parameters.publicProjectName) }}: name: $(linuxArm64PublicPoolName) + demands: ImageOverride -equals $(linuxArm64PublicPoolImage) ${{ if eq(variables['System.TeamProject'], parameters.internalProjectName) }}: name: $(linuxArm64InternalPoolName) + image: $(linuxArm64InternalPoolImage) # Linux Arm32 linuxArm32Pool: os: linux hostArchitecture: Arm64 - image: $(linuxArm32PoolImage) ${{ if eq(variables['System.TeamProject'], parameters.publicProjectName) }}: name: $(linuxArm32PublicPoolName) + demands: ImageOverride -equals $(linuxArm32PublicPoolImage) ${{ if eq(variables['System.TeamProject'], parameters.internalProjectName) }}: name: $(linuxArm32InternalPoolName) + image: $(linuxArm32InternalPoolImage) # Windows Server 2016 windows2016Pool: diff --git a/eng/docker-tools/templates/variables/docker-images.yml b/eng/docker-tools/templates/variables/docker-images.yml index 999a72cf..4c6b57e7 100644 --- a/eng/docker-tools/templates/variables/docker-images.yml +++ b/eng/docker-tools/templates/variables/docker-images.yml @@ -1,5 +1,5 @@ variables: - imageNames.imageBuilderName: mcr.microsoft.com/dotnet-buildtools/image-builder:2877314 + imageNames.imageBuilderName: mcr.microsoft.com/dotnet-buildtools/image-builder:2880049 imageNames.imageBuilder: $(imageNames.imageBuilderName) imageNames.imageBuilder.withrepo: imagebuilder-withrepo:$(Build.BuildId)-$(System.JobId) imageNames.testRunner: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux3.0-docker-testrunner diff --git a/eng/docker-tools/templates/variables/dotnet/common.yml b/eng/docker-tools/templates/variables/dotnet/common.yml index 8f98c092..bae16112 100644 --- a/eng/docker-tools/templates/variables/dotnet/common.yml +++ b/eng/docker-tools/templates/variables/dotnet/common.yml @@ -15,18 +15,26 @@ variables: - name: linuxAmd64InternalPoolImage value: 1es-ubuntu-2204 +- name: linuxAmd64PublicPoolImage + value: Azure-Linux-3-Amd64-Public +- name: linuxAmd64PublicPoolName + value: NetCore-Public - name: linuxAmd64InternalPoolName value: NetCore1ESPool-Internal -- name: linuxArm64PoolImage - value: Mariner-2-Docker-ARM64 +- name: linuxArm64PublicPoolImage + value: azure-linux-3-arm64-public +- name: linuxArm64InternalPoolImage + value: azure-linux-3-arm64 - name: linuxArm64PublicPoolName value: Docker-Linux-Arm-Public - name: linuxArm64InternalPoolName value: Docker-Linux-Arm-Internal -- name: linuxArm32PoolImage - value: Mariner-2-Docker-ARM64 +- name: linuxArm32PublicPoolImage + value: azure-linux-3-arm64-public +- name: linuxArm32InternalPoolImage + value: azure-linux-3-arm64 - name: linuxArm32PublicPoolName value: Docker-Linux-Arm-Public - name: linuxArm32InternalPoolName