Use helix platform variable aliases for macOS ARM64 and x64 queues#121373
Use helix platform variable aliases for macOS ARM64 and x64 queues#121373
Conversation
Co-authored-by: agocke <[email protected]>
|
@copilot Do you need to import the variables definition file? |
Co-authored-by: agocke <[email protected]>
Yes, good catch! Added the import in eng/pipelines/common/variables.yml (commit 65c5bd5). The helix-platforms.yml file wasn't being imported anywhere, so the variables would not have been available. All pipelines (coreclr, libraries, runtime) include common/variables.yml, so they'll now have access to the helix platform variable aliases. |
|
@copilot can you just import the variables in the files that need it, to prevent pipeline template pollution? |
…ad of common variables Co-authored-by: agocke <[email protected]>
Done in commit 363d319. Moved the import from common/variables.yml to the three helix-queues-setup.yml files that actually use the variables (installer, libraries, and coreclr/templates). This prevents polluting the common variables namespace. |
|
@copilot It looks like this commit broke CI -- the runtime pipeline is no longer running |
…x-queues-setup files Co-authored-by: agocke <[email protected]>
Fixed in commit 59982bd. The issue was that I added a |
|
@copilot it looks like helix-queues-setup takes variables as a parameter. Can we add the variables import there? |
Co-authored-by: agocke <[email protected]>
Co-authored-by: agocke <[email protected]>
|
@elinor-fung ok this pr is up to date and it does look like there are some failing host tests |
|
The |
|
I'd like to switch us over to the new queues in the next few days, so can we prioritize investigating these issues? |
|
I'm not aware of any new behaviors, but I'm updating my Mac to investigate. |
|
It looks like the new behavior of codesign is to only hash the __TEXT segment, whereas it used to hash the entire file. It looks like this doesn't affect whether or not Mac allows the file to be run. We could disable the test to get this in and file an issue for the fix. It may be simple enough for copilot. |
Do you know if that is also the case for before macOS 26 - that is, just hashing the __TEXT segment still runs fine on 15 or below?
If yes for the above, that sounds reasonable to me - assuming we basically immediately file the issue and try to (get copilot to) handle it. |
|
@copilot please temporarily skip the following test:
|
…change Co-authored-by: agocke <[email protected]>
Done in commit 5855401. Added Skip attribute to the |
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 for Sequoia 15.
Changes Made
Pipeline Configuration Files:
Helix Platform Definitions (helix-platforms.yml):
helix_macos_x64_latestfrom OSX.13.Amd64.Open to OSX.15.Amd64.Open (Sequoia 15)helix_macos_x64_latest_internalfrom OSX.13.Amd64 to OSX.15.Amd64 (Sequoia 15)${{ variables.* }}for variable definitionsQueue Setup Files:
$(helix_macos_arm64)and$(helix_macos_x64)$(helix_macos_arm64)and$(helix_macos_x64)$(helix_macos_arm64)and$(helix_macos_x64)while preserving superpmi-diffs exception (OSX.14.Arm64.Open) and internal queuesTest Changes:
MatchesCodesignOutputtest 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
${{ variables.* }}for compile-time evaluation$(...)for runtime evaluationOut of Scope
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)💬 We'd love your input! Share your thoughts on Copilot coding agent in our 2 minute survey.