Use helix platform variable aliases for macOS ARM64 and x64 queues

eng/pipelines/common/variables.yml

@@ -5,9 +5,9 @@
 
 variables:
 
 # These values enable longer delays, configurable number of retries, and special understanding of TCP hang-up
 # See https://github.com/NuGet/Home/issues/11027 for details
 - name: NUGET_ENABLE_EXPERIMENTAL_HTTP_RETRY
   value: true
 - name: NUGET_EXPERIMENTAL_MAX_NETWORK_TRY_COUNT
   value: 6
@@ -19,7 +19,7 @@
   value: ${{ eq(variables['Build.DefinitionName'], 'dotnet-runtime-codeql') }}
 
 - name: isOfficialBuild
   value: ${{ and(eq(variables['System.TeamProject'], 'internal'), eq(variables['Build.DefinitionName'], 'dotnet-runtime-official')) }}
 - name: isRollingBuild
   value: ${{ ne(variables['Build.Reason'], 'PullRequest') }}
 - name: isExtraPlatformsBuild
@@ -27,11 +27,11 @@
 - name: isNotExtraPlatformsBuild
   value: ${{ ne(variables['Build.DefinitionName'], 'runtime-extra-platforms') }}
 - name: isWasmOnlyBuild
   value: ${{ in(variables['Build.DefinitionName'], 'runtime-wasm', 'runtime-wasm-libtests', 'runtime-wasm-non-libtests', 'runtime-wasm-dbgtests', 'runtime-wasm-optional') }}
 - name: isiOSLikeOnlyBuild
   value: ${{ in(variables['Build.DefinitionName'], 'runtime-ioslike') }}
 - name: isiOSLikeSimulatorOnlyBuild
   value: ${{ in(variables['Build.DefinitionName'], 'runtime-ioslikesimulator') }}
 - name: isAndroidOnlyBuild
   value: ${{ in(variables['Build.DefinitionName'], 'runtime-android') }}
 - name: isAndroidEmulatorOnlyBuild
@@ -41,9 +41,9 @@
 - name: isLinuxBionicOnlyBuild
   value: ${{ in(variables['Build.DefinitionName'], 'runtime-linuxbionic') }}
 - name: isRunSmokeTestsOnly
   value: ${{ notin(variables['Build.DefinitionName'], 'runtime-extra-platforms', 'runtime-wasm', 'runtime-wasm-libtests', 'runtime-wasm-non-libtests', 'runtime-ioslike', 'runtime-ioslikesimulator', 'runtime-android', 'runtime-androidemulator', 'runtime-maccatalyst', 'runtime-linuxbionic') }}
 - name: isNotSpecificPlatformOnlyBuild
   value: ${{ notin(variables['Build.DefinitionName'], 'runtime-wasm', 'runtime-wasm-libtests', 'runtime-wasm-non-libtests', 'runtime-ioslike', 'runtime-ioslikesimulator', 'runtime-android', 'runtime-androidemulator', 'runtime-maccatalyst', 'runtime-linuxbionic') }}
 
 - name: debugOnPrReleaseOnRolling
   ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
@@ -58,4 +58,6 @@
                 ne(variables['isExtraPlatformsBuild'], true),
                 eq(variables['isRollingBuild'], true))) ]
 
 - template: /eng/common/${{ parameters.templatePath }}/variables/pool-providers.yml
+
+- template: /eng/pipelines/helix-platforms.yml

eng/pipelines/common/xplat-setup.yml

@@ -20,6 +20,7 @@ jobs:
 
     variables:
       - template: /eng/common/${{ coalesce(parameters.jobParameters.templatePath, 'templates') }}/variables/pool-providers.yml
+      - template: /eng/pipelines/helix-platforms.yml
       # Disable component governance in our CI builds. These builds are not shipping nor
       # are they a service. Also the component governance jobs issue lots of inconsequential
       # warnings and errors into our build timelines that make it hard to track down

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

@@ -104,20 +104,17 @@ jobs:
 
     # OSX arm64
     - ${{ if eq(parameters.platform, 'osx_arm64') }}:
-      - ${{ 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'), ne(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.helixQueueGroup, 'superpmi-diffs')) }}:
-        # superpmi is not about testing platform differences, so go with highest capacity queue
+      - ${{ if and(eq(variables['System.TeamProject'], 'public'), ne(parameters.jobParameters.helixQueueGroup, 'superpmi-diffs')) }}:
+        - ${{ variables.helix_macos_arm64 }}
+      - ${{ if and(eq(variables['System.TeamProject'], 'public'), eq(parameters.jobParameters.helixQueueGroup, 'superpmi-diffs')) }}:
         - OSX.14.Arm64.Open
       - ${{ if eq(variables['System.TeamProject'], 'internal') }}:
         - OSX.14.Arm64
 
     # OSX x64
     - ${{ if eq(parameters.platform, 'osx_x64') }}:
       - ${{ if eq(variables['System.TeamProject'], 'public') }}:
-        - OSX.13.Amd64.Open
+        - ${{ variables.helix_macos_x64 }}
       - ${{ if eq(variables['System.TeamProject'], 'internal') }}:
         - OSX.13.Amd64
 

eng/pipelines/installer/helix-queues-setup.yml

@@ -45,14 +45,11 @@ jobs:
 
     # OSX arm64
     - ${{ if eq(parameters.platform, 'osx_arm64') }}:
-      - ${{ if eq(parameters.jobParameters.isExtraPlatformsBuild, true) }}:
-        - OSX.26.Arm64.Open
-      - ${{ if ne(parameters.jobParameters.isExtraPlatformsBuild, true) }}:
-        - osx.13.Arm64.Open
+      - ${{ variables.helix_macos_arm64 }}
 
     # OSX x64
     - ${{ if eq(parameters.platform, 'osx_x64') }}:
-      - OSX.13.Amd64.Open
+      - ${{ variables.helix_macos_x64 }}
 
     # windows x64
     - ${{ if eq(parameters.platform, 'windows_x64') }}:

eng/pipelines/libraries/helix-queues-setup.yml

@@ -78,14 +78,11 @@ jobs:
 
     # OSX arm64
     - ${{ if eq(parameters.platform, 'osx_arm64') }}:
-      - ${{ if eq(parameters.jobParameters.isExtraPlatformsBuild, true) }}:
-        - OSX.26.Arm64.Open
-      - ${{ if ne(parameters.jobParameters.isExtraPlatformsBuild, true) }}:
-        - osx.13.arm64.open
+      - ${{ variables.helix_macos_arm64 }}
 
     # OSX x64
     - ${{ if eq(parameters.platform, 'osx_x64') }}:
-      - OSX.13.Amd64.Open
+      - ${{ variables.helix_macos_x64 }}
 
     # Android
     - ${{ if in(parameters.platform, 'android_x86', 'android_x64', 'linux_bionic_x64') }}: