From 4c054f8d57f180e74c4e2acece8a7091bf260897 Mon Sep 17 00:00:00 2001 From: chcosta Date: Fri, 14 Aug 2026 10:18:17 -0700 Subject: [PATCH 1/2] Use rolling Windows Helix queue for CoreCLR --- eng/pipelines/coreclr/templates/helix-queues-setup.yml | 4 ++-- src/coreclr/scripts/superpmi_collect_setup.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/pipelines/coreclr/templates/helix-queues-setup.yml b/eng/pipelines/coreclr/templates/helix-queues-setup.yml index 62d9c24a9b7d79..0bc948cb79cb4e 100644 --- a/eng/pipelines/coreclr/templates/helix-queues-setup.yml +++ b/eng/pipelines/coreclr/templates/helix-queues-setup.yml @@ -147,7 +147,7 @@ jobs: # windows x64 - ${{ if eq(parameters.platform, 'windows_x64') }}: - ${{ if and(eq(variables['System.TeamProject'], 'public'), ne(parameters.jobParameters.helixQueueGroup, 'cet')) }}: - - Windows.10.Amd64.Open + - Windows.Amd64.Open - ${{ if and(eq(variables['System.TeamProject'], 'public'), eq(parameters.jobParameters.helixQueueGroup, 'cet')) }}: - Windows.11.Amd64.Cet.Open - ${{ if eq(variables['System.TeamProject'], 'internal') }}: @@ -156,7 +156,7 @@ jobs: # windows x86 - ${{ if eq(parameters.platform, 'windows_x86') }}: - ${{ if eq(variables['System.TeamProject'], 'public') }}: - - Windows.10.Amd64.Open + - Windows.Amd64.Open - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - Windows.10.Amd64.X86.Rt diff --git a/src/coreclr/scripts/superpmi_collect_setup.py b/src/coreclr/scripts/superpmi_collect_setup.py index c7aefa8c5d8a9c..63413d67888ab8 100644 --- a/src/coreclr/scripts/superpmi_collect_setup.py +++ b/src/coreclr/scripts/superpmi_collect_setup.py @@ -469,7 +469,7 @@ def main(main_args): if arch == "arm64": # public windows_arm64 helix_queue = "Windows.11.Arm64.Open" else: # public windows_x64 - helix_queue = "Windows.10.Amd64.Open" + helix_queue = "Windows.Amd64.Open" elif platform_name == "linux": if arch == "arm": # public linux_arm helix_queue = "(Debian.12.Arm32.Open)Ubuntu.2204.ArmArch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-12-helix-arm32v7" From 16c3ec6ea6622c899ec30cab4d0a32baa3d1218b Mon Sep 17 00:00:00 2001 From: chcosta Date: Fri, 14 Aug 2026 11:45:45 -0700 Subject: [PATCH 2/2] fix queue names, add '.rt' --- eng/pipelines/coreclr/templates/helix-queues-setup.yml | 6 +++--- src/coreclr/scripts/superpmi_collect_setup.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/pipelines/coreclr/templates/helix-queues-setup.yml b/eng/pipelines/coreclr/templates/helix-queues-setup.yml index 0bc948cb79cb4e..229d84a474468a 100644 --- a/eng/pipelines/coreclr/templates/helix-queues-setup.yml +++ b/eng/pipelines/coreclr/templates/helix-queues-setup.yml @@ -147,16 +147,16 @@ jobs: # windows x64 - ${{ if eq(parameters.platform, 'windows_x64') }}: - ${{ if and(eq(variables['System.TeamProject'], 'public'), ne(parameters.jobParameters.helixQueueGroup, 'cet')) }}: - - Windows.Amd64.Open + - Windows.Amd64.Open.rt - ${{ if and(eq(variables['System.TeamProject'], 'public'), eq(parameters.jobParameters.helixQueueGroup, 'cet')) }}: - Windows.11.Amd64.Cet.Open - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - - Windows.10.Amd64 + - Windows.Amd64.rt # windows x86 - ${{ if eq(parameters.platform, 'windows_x86') }}: - ${{ if eq(variables['System.TeamProject'], 'public') }}: - - Windows.Amd64.Open + - Windows.Amd64.Open.rt - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - Windows.10.Amd64.X86.Rt diff --git a/src/coreclr/scripts/superpmi_collect_setup.py b/src/coreclr/scripts/superpmi_collect_setup.py index 63413d67888ab8..e18192c38293bf 100644 --- a/src/coreclr/scripts/superpmi_collect_setup.py +++ b/src/coreclr/scripts/superpmi_collect_setup.py @@ -469,7 +469,7 @@ def main(main_args): if arch == "arm64": # public windows_arm64 helix_queue = "Windows.11.Arm64.Open" else: # public windows_x64 - helix_queue = "Windows.Amd64.Open" + helix_queue = "Windows.Amd64.Open.rt" elif platform_name == "linux": if arch == "arm": # public linux_arm helix_queue = "(Debian.12.Arm32.Open)Ubuntu.2204.ArmArch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-12-helix-arm32v7"