From c1892b74614d8b740d147e1b3351fcbfc32f4d58 Mon Sep 17 00:00:00 2001 From: Rich Lander Date: Fri, 13 Mar 2026 13:39:06 -0700 Subject: [PATCH 1/2] Upgrade Ubuntu helix queues from 22.04 VMs to containers Replace bare Ubuntu 22.04 VM helix queue references with container equivalents hosted on AzureLinux 3: - libraries helix-queues-setup: Mono and general CoreCLR sets move from Ubuntu.2204.Amd64.Open VM to ubuntu-26.04-helix-amd64 container. Remove redundant 26.04 entry from extra-platforms (now in general set). - helix-platforms: Oldest Ubuntu x64, Ubuntu x64 ubuntu-specific, and ARM64 variables move from bare 22.04 VMs to 22.04 containers on AzureLinux hosts. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- eng/pipelines/helix-platforms.yml | 8 ++++---- eng/pipelines/libraries/helix-queues-setup.yml | 5 ++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/eng/pipelines/helix-platforms.yml b/eng/pipelines/helix-platforms.yml index e1ddcef6681bd8..9c699e5f1a8160 100644 --- a/eng/pipelines/helix-platforms.yml +++ b/eng/pipelines/helix-platforms.yml @@ -97,10 +97,10 @@ variables: # Oldest: Ubuntu 22.04 - name: helix_linux_x64_oldest - value: Ubuntu.2204.Amd64.Open + value: (Ubuntu.2204.Amd64.Open)AzureLinux.3.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-helix-amd64 - name: helix_linux_x64_oldest_internal - value: Ubuntu.2204.Amd64 + value: (Ubuntu.2204.Amd64)AzureLinux.3.Amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-helix-amd64 # Ubuntu x64 # Latest: 26.04 @@ -109,7 +109,7 @@ variables: # Oldest: 22.04 - name: helix_linux_x64_ubuntu_oldest - value: Ubuntu.2204.Amd64.Open + value: (Ubuntu.2204.Amd64.Open)AzureLinux.3.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-helix-amd64 # Debian x64 # Latest: 13 @@ -169,7 +169,7 @@ variables: # Oldest: Ubuntu 22.04 - name: helix_linux_arm64_oldest - value: Ubuntu.2204.ArmArch.Open + value: (Ubuntu.2204.ArmArch.Open)AzureLinux.3.Arm64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-helix-arm64v8 # Linux musl x64 # Latest: Alpine edge diff --git a/eng/pipelines/libraries/helix-queues-setup.yml b/eng/pipelines/libraries/helix-queues-setup.yml index 3a018bc981d364..884dc3535194bf 100644 --- a/eng/pipelines/libraries/helix-queues-setup.yml +++ b/eng/pipelines/libraries/helix-queues-setup.yml @@ -56,7 +56,7 @@ jobs: - ${{ else }}: - ${{ if eq(parameters.jobParameters.runtimeFlavor, 'mono') }}: # Mono path - test minimal scenario - - Ubuntu.2204.Amd64.Open + - (Ubuntu.2604.Amd64.Open)AzureLinux.3.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-26.04-helix-amd64 - ${{ else }}: # CoreCLR path - ${{ if and(eq(parameters.jobParameters.isExtraPlatformsBuild, true), ne(parameters.jobParameters.testScope, 'outerloop'))}}: @@ -64,7 +64,6 @@ jobs: - (Debian.13.Amd64.Open)AzureLinux.3.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-13-helix-amd64 - (Fedora.43.Amd64.Open)AzureLinux.3.Amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-43-helix-amd64 - (openSUSE.16.0.Amd64.Open)AzureLinux.3.Amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:opensuse-16.0-helix-amd64 - - (Ubuntu.2604.Amd64.Open)AzureLinux.3.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-26.04-helix-amd64 - ${{ if eq(parameters.jobParameters.testScope, 'outerloop') }}: # outerloop only CoreCLR @@ -72,7 +71,7 @@ jobs: - ${{ if or(ne(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true))}}: # inner and outer loop CoreCLR (general set) - - Ubuntu.2204.Amd64.Open + - (Ubuntu.2604.Amd64.Open)AzureLinux.3.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-26.04-helix-amd64 - (AzureLinux.3.0.Amd64.Open)AzureLinux.3.Amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-helix-amd64 - (Centos.10.Amd64.Open)AzureLinux.3.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream-10-helix-amd64 From ae356dbeeb0d7b54d46f35b10b8d67a072b1495e Mon Sep 17 00:00:00 2001 From: Rich Lander <2608468+richlander@users.noreply.github.com> Date: Fri, 13 Mar 2026 13:48:23 -0700 Subject: [PATCH 2/2] Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- eng/pipelines/libraries/helix-queues-setup.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/pipelines/libraries/helix-queues-setup.yml b/eng/pipelines/libraries/helix-queues-setup.yml index 884dc3535194bf..4fa5d405702402 100644 --- a/eng/pipelines/libraries/helix-queues-setup.yml +++ b/eng/pipelines/libraries/helix-queues-setup.yml @@ -62,8 +62,8 @@ jobs: - ${{ if and(eq(parameters.jobParameters.isExtraPlatformsBuild, true), ne(parameters.jobParameters.testScope, 'outerloop'))}}: # extra-platforms CoreCLR (inner loop only) - (Debian.13.Amd64.Open)AzureLinux.3.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-13-helix-amd64 - - (Fedora.43.Amd64.Open)AzureLinux.3.Amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-43-helix-amd64 - - (openSUSE.16.0.Amd64.Open)AzureLinux.3.Amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:opensuse-16.0-helix-amd64 + - (Fedora.43.Amd64.Open)AzureLinux.3.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-43-helix-amd64 + - (openSUSE.16.0.Amd64.Open)AzureLinux.3.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:opensuse-16.0-helix-amd64 - ${{ if eq(parameters.jobParameters.testScope, 'outerloop') }}: # outerloop only CoreCLR @@ -72,7 +72,7 @@ jobs: - ${{ if or(ne(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true))}}: # inner and outer loop CoreCLR (general set) - (Ubuntu.2604.Amd64.Open)AzureLinux.3.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-26.04-helix-amd64 - - (AzureLinux.3.0.Amd64.Open)AzureLinux.3.Amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-helix-amd64 + - (AzureLinux.3.0.Amd64.Open)AzureLinux.3.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-helix-amd64 - (Centos.10.Amd64.Open)AzureLinux.3.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream-10-helix-amd64 # OSX arm64