Skip to content

[nightly] Update common Docker engineering infrastructure with latest #6923

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lbussell merged 1 commit into from
Jan 15, 2026
+20 −8
Merged

[nightly] Update common Docker engineering infrastructure with latest #6923

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions eng/docker-tools/templates/stages/dotnet/build-and-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion eng/docker-tools/templates/variables/docker-images.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
variables:
imageNames.imageBuilderName: mcr.microsoft.com/dotnet-buildtools/image-builder:2864167
imageNames.imageBuilderName: mcr.microsoft.com/dotnet-buildtools/image-builder:2877314
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
Expand Down
16 changes: 12 additions & 4 deletions eng/docker-tools/templates/variables/dotnet/common.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading