Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 3 additions & 5 deletions eng/pipelines/coreclr/templates/helix-queues-setup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -132,19 +132,17 @@ jobs:

# OSX arm64
- ${{ if eq(parameters.platform, 'osx_arm64') }}:
- ${{ if and(eq(variables['System.TeamProject'], 'public'), ne(parameters.jobParameters.helixQueueGroup, 'superpmi-diffs')) }}:
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
- $(helix_macos_arm64)
- ${{ if and(eq(variables['System.TeamProject'], 'public'), eq(parameters.jobParameters.helixQueueGroup, 'superpmi-diffs')) }}:
- OSX.15.Arm64.Open
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- OSX.14.Arm64
- $(helix_macos_arm64_latest_internal)

# OSX x64
- ${{ if eq(parameters.platform, 'osx_x64') }}:
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
- $(helix_macos_x64)
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- OSX.13.Amd64
- $(helix_macos_x64_latest_internal)

# windows x64
- ${{ if eq(parameters.platform, 'windows_x64') }}:
Expand Down
4 changes: 2 additions & 2 deletions src/coreclr/scripts/superpmi_collect_setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -479,7 +479,7 @@ def main(main_args):
helix_queue = "azurelinux.3.amd64.open"
elif platform_name == "osx":
if arch == "arm64": # public osx_arm64
helix_queue = "OSX.15.Arm64.Open"
helix_queue = "OSX.26.Arm64.Open"
else: # public osx_x64
helix_queue = "OSX.15.Amd64.Open"
else:
Expand All @@ -497,7 +497,7 @@ def main(main_args):
helix_queue = "azurelinux.3.amd64"
elif platform_name == "osx":
if arch == "arm64": # internal osx_arm64
helix_queue = "OSX.15.Arm64"
helix_queue = "OSX.26.Arm64"
else: # internal osx_x64
helix_queue = "OSX.15.Amd64"

Expand Down
Loading