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 311b16133..30ec5240e 100644 --- a/eng/docker-tools/templates/stages/dotnet/build-and-test.yml +++ b/eng/docker-tools/templates/stages/dotnet/build-and-test.yml @@ -80,21 +80,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/dotnet/common.yml b/eng/docker-tools/templates/variables/dotnet/common.yml index 8f98c0921..31659f3d9 100644 --- a/eng/docker-tools/templates/variables/dotnet/common.yml +++ b/eng/docker-tools/templates/variables/dotnet/common.yml @@ -18,15 +18,19 @@ variables: - 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