Skip to content

Commit a264153

Browse files
Update common Docker engineering infrastructure with latest
1 parent bb1c8cd commit a264153

File tree

3 files changed

+20
-8
lines changed

3 files changed

+20
-8
lines changed

eng/docker-tools/templates/stages/dotnet/build-and-test.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,9 @@ stages:
7070
${{ if ne(parameters.linuxAmd64Pool, '') }}:
7171
${{ parameters.linuxAmd64Pool }}
7272
${{ elseif eq(variables['System.TeamProject'], parameters.publicProjectName) }}:
73-
vmImage: $(defaultLinuxAmd64PoolImage)
73+
name: $(linuxAmd64PublicPoolName)
74+
demands: ImageOverride -equals $(linuxAmd64PublicPoolImage)
75+
os: linux
7476
${{ elseif eq(variables['System.TeamProject'], parameters.internalProjectName) }}:
7577
name: $(linuxAmd64InternalPoolName)
7678
image: $(linuxAmd64InternalPoolImage)
@@ -80,21 +82,23 @@ stages:
8082
linuxArm64Pool:
8183
os: linux
8284
hostArchitecture: Arm64
83-
image: $(linuxArm64PoolImage)
8485
${{ if eq(variables['System.TeamProject'], parameters.publicProjectName) }}:
8586
name: $(linuxArm64PublicPoolName)
87+
demands: ImageOverride -equals $(linuxArm64PublicPoolImage)
8688
${{ if eq(variables['System.TeamProject'], parameters.internalProjectName) }}:
8789
name: $(linuxArm64InternalPoolName)
90+
image: $(linuxArm64InternalPoolImage)
8891

8992
# Linux Arm32
9093
linuxArm32Pool:
9194
os: linux
9295
hostArchitecture: Arm64
93-
image: $(linuxArm32PoolImage)
9496
${{ if eq(variables['System.TeamProject'], parameters.publicProjectName) }}:
9597
name: $(linuxArm32PublicPoolName)
98+
demands: ImageOverride -equals $(linuxArm32PublicPoolImage)
9699
${{ if eq(variables['System.TeamProject'], parameters.internalProjectName) }}:
97100
name: $(linuxArm32InternalPoolName)
101+
image: $(linuxArm32InternalPoolImage)
98102

99103
# Windows Server 2016
100104
windows2016Pool:

eng/docker-tools/templates/variables/docker-images.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
variables:
2-
imageNames.imageBuilderName: mcr.microsoft.com/dotnet-buildtools/image-builder:2877314
2+
imageNames.imageBuilderName: mcr.microsoft.com/dotnet-buildtools/image-builder:2880049
33
imageNames.imageBuilder: $(imageNames.imageBuilderName)
44
imageNames.imageBuilder.withrepo: imagebuilder-withrepo:$(Build.BuildId)-$(System.JobId)
55
imageNames.testRunner: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux3.0-docker-testrunner

eng/docker-tools/templates/variables/dotnet/common.yml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,26 @@ variables:
1515

1616
- name: linuxAmd64InternalPoolImage
1717
value: 1es-ubuntu-2204
18+
- name: linuxAmd64PublicPoolImage
19+
value: Azure-Linux-3-Amd64-Public
20+
- name: linuxAmd64PublicPoolName
21+
value: NetCore-Public
1822
- name: linuxAmd64InternalPoolName
1923
value: NetCore1ESPool-Internal
2024

21-
- name: linuxArm64PoolImage
22-
value: Mariner-2-Docker-ARM64
25+
- name: linuxArm64PublicPoolImage
26+
value: azure-linux-3-arm64-public
27+
- name: linuxArm64InternalPoolImage
28+
value: azure-linux-3-arm64
2329
- name: linuxArm64PublicPoolName
2430
value: Docker-Linux-Arm-Public
2531
- name: linuxArm64InternalPoolName
2632
value: Docker-Linux-Arm-Internal
2733

28-
- name: linuxArm32PoolImage
29-
value: Mariner-2-Docker-ARM64
34+
- name: linuxArm32PublicPoolImage
35+
value: azure-linux-3-arm64-public
36+
- name: linuxArm32InternalPoolImage
37+
value: azure-linux-3-arm64
3038
- name: linuxArm32PublicPoolName
3139
value: Docker-Linux-Arm-Public
3240
- name: linuxArm32InternalPoolName

0 commit comments

Comments
 (0)