diff --git a/eng/pipelines/coreclr/templates/helix-queues-setup.yml b/eng/pipelines/coreclr/templates/helix-queues-setup.yml index 3b1ae77b6d6abe..5cb807738cd971 100644 --- a/eng/pipelines/coreclr/templates/helix-queues-setup.yml +++ b/eng/pipelines/coreclr/templates/helix-queues-setup.yml @@ -104,9 +104,11 @@ jobs: # OSX arm64 - ${{ if eq(parameters.platform, 'osx_arm64') }}: - - ${{ if and(eq(variables['System.TeamProject'], 'public'), ne(parameters.jobParameters.helixQueueGroup, 'superpmi-diffs')) }}: + - ${{ if and(eq(variables['System.TeamProject'], 'public'), eq(parameters.jobParameters.isExtraPlatformsBuild, true)) }}: + - OSX.26.Arm64.Open + - ${{ if and(eq(variables['System.TeamProject'], 'public'), ne(parameters.jobParameters.isExtraPlatformsBuild, true), ne(parameters.jobParameters.helixQueueGroup, 'superpmi-diffs')) }}: - OSX.13.Arm64.Open - - ${{ if and(eq(variables['System.TeamProject'], 'public'), eq(parameters.jobParameters.helixQueueGroup, 'superpmi-diffs')) }}: + - ${{ if and(eq(variables['System.TeamProject'], 'public'), ne(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.helixQueueGroup, 'superpmi-diffs')) }}: # superpmi is not about testing platform differences, so go with highest capacity queue - OSX.14.Arm64.Open - ${{ if eq(variables['System.TeamProject'], 'internal') }}: diff --git a/eng/pipelines/extra-platforms/runtime-extra-platforms-other.yml b/eng/pipelines/extra-platforms/runtime-extra-platforms-other.yml index d4c755945c0372..1c956658e4f7ba 100644 --- a/eng/pipelines/extra-platforms/runtime-extra-platforms-other.yml +++ b/eng/pipelines/extra-platforms/runtime-extra-platforms-other.yml @@ -21,6 +21,7 @@ jobs: - linux_arm64 - linux_musl_x64 - osx_x64 + - osx_arm64 - windows_x64 - windows_x86 - windows_arm64 diff --git a/eng/pipelines/installer/helix-queues-setup.yml b/eng/pipelines/installer/helix-queues-setup.yml index 582294a4a39d6a..51ff895c753a87 100644 --- a/eng/pipelines/installer/helix-queues-setup.yml +++ b/eng/pipelines/installer/helix-queues-setup.yml @@ -45,7 +45,10 @@ jobs: # OSX arm64 - ${{ if eq(parameters.platform, 'osx_arm64') }}: - - osx.13.Arm64.Open + - ${{ if eq(parameters.jobParameters.isExtraPlatformsBuild, true) }}: + - OSX.26.Arm64.Open + - ${{ if ne(parameters.jobParameters.isExtraPlatformsBuild, true) }}: + - osx.13.Arm64.Open # OSX x64 - ${{ if eq(parameters.platform, 'osx_x64') }}: diff --git a/eng/pipelines/libraries/helix-queues-setup.yml b/eng/pipelines/libraries/helix-queues-setup.yml index 71713d3bccb3c7..3bde37d587b2dc 100644 --- a/eng/pipelines/libraries/helix-queues-setup.yml +++ b/eng/pipelines/libraries/helix-queues-setup.yml @@ -78,7 +78,10 @@ jobs: # OSX arm64 - ${{ if eq(parameters.platform, 'osx_arm64') }}: - - osx.13.arm64.open + - ${{ if eq(parameters.jobParameters.isExtraPlatformsBuild, true) }}: + - OSX.26.Arm64.Open + - ${{ if ne(parameters.jobParameters.isExtraPlatformsBuild, true) }}: + - osx.13.arm64.open # OSX x64 - ${{ if eq(parameters.platform, 'osx_x64') }}: