Skip to content

Commit e40a978

Browse files
authored
Move macOS PR helix queues to 26 for arm64 and 15 for amd64 (#121373)
Replace hardcoded macOS queue names with centralized variable aliases from `eng/pipelines/helix-platforms.yml`, enabling automatic version updates across PR and CI definitions. This PR updates the default queues for libraries and coreclr PRs to use the latest macOS versions. ## Changes Made **Pipeline Configuration Files:** - Added helix-platforms.yml import to runtime.yml, coreclr/ci.yml, and libraries/variables.yml at the pipeline level to avoid Azure Pipelines size limits **Helix Platform Definitions (helix-platforms.yml):** - Updated `helix_macos_x64_latest` from OSX.13.Amd64.Open to OSX.15.Amd64.Open (Sequoia 15) - Updated `helix_macos_x64_latest_internal` from OSX.13.Amd64 to OSX.15.Amd64 (Sequoia 15) - ARM64 uses OSX.26.Arm64.Open (Sequoia 15 with macOS 26.x kernel) - x64 uses OSX.15.Amd64.Open (Sequoia 15) - Changed common aliases to use template substitution `${{ variables.* }}` for variable definitions **Queue Setup Files:** - installer/helix-queues-setup.yml: Replaced hardcoded OSX queue names with runtime expansion `$(helix_macos_arm64)` and `$(helix_macos_x64)` - libraries/helix-queues-setup.yml: Replaced hardcoded OSX queue names with runtime expansion `$(helix_macos_arm64)` and `$(helix_macos_x64)` - coreclr/templates/helix-queues-setup.yml: Replaced public branch hardcoded queue names with runtime expansion `$(helix_macos_arm64)` and `$(helix_macos_x64)` while preserving superpmi-diffs exception (OSX.14.Arm64.Open) and internal queues **Test Changes:** - Temporarily skipped `MatchesCodesignOutput` test due to macOS 26 codesign behavior change (only hashing __TEXT segment instead of entire file). This test will need to be updated in a follow-up to accommodate the new codesign behavior. ## Variable Expansion Strategy - **Variable definitions** in helix-platforms.yml use template substitution `${{ variables.* }}` for compile-time evaluation - **Variable references** in helix-queues-setup.yml files use runtime expansion `$(...)` for runtime evaluation ## Out of Scope - iOS/tvOS simulator/device queues (unchanged) - Python scripts (e.g., superpmi_collect_setup.py) - Older versions remain at their respective macOS versions ## Current Variable Resolutions - `helix_macos_arm64` → OSX.26.Arm64.Open (Sequoia 15) - `helix_macos_x64` → OSX.15.Amd64.Open (Sequoia 15) - `helix_macos_arm64_latest_internal` → OSX.26.Arm64 (Sequoia 15) - `helix_macos_x64_latest_internal` → OSX.15.Amd64 (Sequoia 15)
1 parent 1395bb6 commit e40a978

File tree

6 files changed

+98
-103
lines changed

6 files changed

+98
-103
lines changed

eng/pipelines/coreclr/templates/helix-queues-setup.yml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -104,20 +104,17 @@ jobs:
104104

105105
# OSX arm64
106106
- ${{ if eq(parameters.platform, 'osx_arm64') }}:
107-
- ${{ if and(eq(variables['System.TeamProject'], 'public'), eq(parameters.jobParameters.isExtraPlatformsBuild, true)) }}:
108-
- OSX.26.Arm64.Open
109-
- ${{ if and(eq(variables['System.TeamProject'], 'public'), ne(parameters.jobParameters.isExtraPlatformsBuild, true), ne(parameters.jobParameters.helixQueueGroup, 'superpmi-diffs')) }}:
110-
- OSX.13.Arm64.Open
111-
- ${{ if and(eq(variables['System.TeamProject'], 'public'), ne(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.helixQueueGroup, 'superpmi-diffs')) }}:
112-
# superpmi is not about testing platform differences, so go with highest capacity queue
107+
- ${{ if and(eq(variables['System.TeamProject'], 'public'), ne(parameters.jobParameters.helixQueueGroup, 'superpmi-diffs')) }}:
108+
- $(helix_macos_arm64)
109+
- ${{ if and(eq(variables['System.TeamProject'], 'public'), eq(parameters.jobParameters.helixQueueGroup, 'superpmi-diffs')) }}:
113110
- OSX.14.Arm64.Open
114111
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
115112
- OSX.14.Arm64
116113

117114
# OSX x64
118115
- ${{ if eq(parameters.platform, 'osx_x64') }}:
119116
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
120-
- OSX.13.Amd64.Open
117+
- $(helix_macos_x64)
121118
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
122119
- OSX.13.Amd64
123120

0 commit comments

Comments
 (0)