Skip to content

[release/10] Bump MacOS helix queues to latest #122990

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
steveisok merged 7 commits into from
Jan 12, 2026
Merged

[release/10] Bump MacOS helix queues to latest #122990

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
801420e
[release/10] Bump MacOS helix queues to MacOS 14
steveisok Jan 7, 2026
8a9f865
Let's do MacOS 26 instead
steveisok Jan 8, 2026
8dbc310
Fix x64
steveisok Jan 8, 2026
a8d04a3
Disable Socket tests on Apple Platforms which requires Local Network …
liveans Nov 17, 2025
30cd584
skip timeout ping tests if test targets are unreachable (#122987)
wfurt Jan 9, 2026
95a5b63
Bump the ios / tvos queues while we're at it. Subset of https://githu…
steveisok Jan 10, 2026
d3dfcee
Skip MatchesCodesignOutput test similar to upstream
steveisok Jan 12, 2026
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
6 changes: 3 additions & 3 deletions eng/pipelines/coreclr/templates/helix-queues-setup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ jobs:
# OSX arm64
- ${{ if eq(parameters.platform, 'osx_arm64') }}:
- ${{ if and(eq(variables['System.TeamProject'], 'public'), ne(parameters.jobParameters.helixQueueGroup, 'superpmi-diffs')) }}:
- OSX.13.Arm64.Open
- OSX.14.Arm64.Open
- ${{ if and(eq(variables['System.TeamProject'], 'public'), eq(parameters.jobParameters.helixQueueGroup, 'superpmi-diffs')) }}:
# superpmi is not about testing platform differences, so go with highest capacity queue
- OSX.14.Arm64.Open
Expand All @@ -115,9 +115,9 @@ jobs:
# OSX x64
- ${{ if eq(parameters.platform, 'osx_x64') }}:
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
- OSX.13.Amd64.Open
- OSX.14.Amd64.Open
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- OSX.13.Amd64
- OSX.14.Amd64

# windows x64
- ${{ if eq(parameters.platform, 'windows_x64') }}:
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/installer/helix-queues-setup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@ jobs:

# OSX arm64
- ${{ if eq(parameters.platform, 'osx_arm64') }}:
- osx.13.Arm64.Open
- osx.14.Arm64.Open

# OSX x64
- ${{ if eq(parameters.platform, 'osx_x64') }}:
- OSX.13.Amd64.Open
- OSX.14.Amd64.Open

# windows x64
- ${{ if eq(parameters.platform, 'windows_x64') }}:
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/libraries/helix-queues-setup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,11 +78,11 @@ jobs:

# OSX arm64
- ${{ if eq(parameters.platform, 'osx_arm64') }}:
- osx.13.arm64.open
- osx.14.arm64.open

# OSX x64
- ${{ if eq(parameters.platform, 'osx_x64') }}:
- OSX.13.Amd64.Open
- OSX.14.Amd64.Open

# Android
- ${{ if in(parameters.platform, 'android_x86', 'android_x64', 'linux_bionic_x64') }}:
Expand Down
8 changes: 4 additions & 4 deletions src/coreclr/scripts/superpmi_collect_setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,9 +470,9 @@ def main(main_args):
helix_queue = "azurelinux.3.amd64.open"
elif platform_name == "osx":
if arch == "arm64": # public osx_arm64
helix_queue = "osx.13.arm64.open"
helix_queue = "osx.14.arm64.open"
else: # public osx_x64
helix_queue = "OSX.13.Amd64.Open"
helix_queue = "OSX.14.Amd64.Open"
else:
if platform_name == "windows":
if arch == "arm64": # internal windows_arm64
Expand All @@ -488,9 +488,9 @@ def main(main_args):
helix_queue = "azurelinux.3.amd64"
elif platform_name == "osx":
if arch == "arm64": # internal osx_arm64
helix_queue = "OSX.13.ARM64"
helix_queue = "OSX.14.ARM64"
else: # internal osx_x64
helix_queue = "OSX.13.Amd64"
helix_queue = "OSX.14.Amd64"

# Copy the superpmi scripts

Expand Down
Loading