diff --git a/eng/pipelines/coreclr/templates/helix-queues-setup.yml b/eng/pipelines/coreclr/templates/helix-queues-setup.yml index 6069993b2d6089..da9aefd9555c77 100644 --- a/eng/pipelines/coreclr/templates/helix-queues-setup.yml +++ b/eng/pipelines/coreclr/templates/helix-queues-setup.yml @@ -34,17 +34,11 @@ jobs: # iOS Simulator/Mac Catalyst arm64 - ${{ if in(parameters.platform, 'iossimulator_arm64', 'tvossimulator_arm64', 'maccatalyst_arm64') }}: - - ${{ if eq(variables['System.TeamProject'], 'public') }}: - - OSX.15.Arm64.Open - - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - - OSX.15.Arm64 + - $(helix_macos_arm64) # iOS/tvOS Simulator x64 & MacCatalyst x64 - ${{ if in(parameters.platform, 'iossimulator_x64', 'tvossimulator_x64', 'maccatalyst_x64') }}: - - ${{ if eq(variables['System.TeamProject'], 'public') }}: - - OSX.15.Amd64.Open - - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - - OSX.15.Amd64 + - $(helix_macos_x64) # Android arm64 - ${{ if in(parameters.platform, 'android_arm64') }}: @@ -69,17 +63,11 @@ jobs: # iOS devices - ${{ if in(parameters.platform, 'ios_arm64') }}: - - ${{ if eq(variables['System.TeamProject'], 'public') }}: - - osx.15.amd64.iphone.open - - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - - osx.15.amd64.iphone + - $(helix_macos_ios_device_latest) # tvOS devices - ${{ if in(parameters.platform, 'tvos_arm64') }}: - - ${{ if eq(variables['System.TeamProject'], 'public') }}: - - osx.15.amd64.appletv.open - - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - - osx.15.amd64.appletv + - $(helix_macos_tvos_device_latest) # Linux arm - ${{ if eq(parameters.platform, 'linux_arm') }}: diff --git a/eng/pipelines/libraries/helix-queues-setup.yml b/eng/pipelines/libraries/helix-queues-setup.yml index 3a018bc981d364..1cf6df8b599b33 100644 --- a/eng/pipelines/libraries/helix-queues-setup.yml +++ b/eng/pipelines/libraries/helix-queues-setup.yml @@ -94,19 +94,19 @@ jobs: # iOS Simulator/Mac Catalyst arm64 - ${{ if in(parameters.platform, 'iossimulator_arm64', 'tvossimulator_arm64', 'maccatalyst_arm64') }}: - - OSX.15.Arm64.Open + - $(helix_macos_arm64) # iOS/tvOS Simulator x64 & MacCatalyst x64 - ${{ if in(parameters.platform, 'iossimulator_x64', 'tvossimulator_x64', 'maccatalyst_x64') }}: - - OSX.15.Amd64.Open + - $(helix_macos_x64) # iOS devices - ${{ if in(parameters.platform, 'ios_arm64') }}: - - osx.15.amd64.iphone.open + - $(helix_macos_ios_device_latest) # tvOS devices - ${{ if in(parameters.platform, 'tvos_arm64') }}: - - osx.15.amd64.appletv.open + - $(helix_macos_tvos_device_latest) # windows x64 - ${{ if eq(parameters.platform, 'windows_x64') }}: diff --git a/eng/pipelines/runtime-ioslike.yml b/eng/pipelines/runtime-ioslike.yml index 1100ec500ce6ff..60f3af01b2eb5c 100644 --- a/eng/pipelines/runtime-ioslike.yml +++ b/eng/pipelines/runtime-ioslike.yml @@ -6,6 +6,7 @@ trigger: none variables: - template: /eng/pipelines/common/variables.yml + - template: /eng/pipelines/helix-platforms.yml extends: template: /eng/pipelines/common/templates/pipeline-with-resources.yml diff --git a/eng/pipelines/runtime-ioslikesimulator.yml b/eng/pipelines/runtime-ioslikesimulator.yml index ca20c526016000..b3e4c37da23362 100644 --- a/eng/pipelines/runtime-ioslikesimulator.yml +++ b/eng/pipelines/runtime-ioslikesimulator.yml @@ -7,6 +7,7 @@ trigger: none variables: - template: /eng/pipelines/common/variables.yml + - template: /eng/pipelines/helix-platforms.yml extends: template: /eng/pipelines/common/templates/pipeline-with-resources.yml diff --git a/eng/pipelines/runtime-maccatalyst.yml b/eng/pipelines/runtime-maccatalyst.yml index cf67dd92d925bf..679186517683be 100644 --- a/eng/pipelines/runtime-maccatalyst.yml +++ b/eng/pipelines/runtime-maccatalyst.yml @@ -6,6 +6,7 @@ trigger: none variables: - template: /eng/pipelines/common/variables.yml + - template: /eng/pipelines/helix-platforms.yml extends: template: /eng/pipelines/common/templates/pipeline-with-resources.yml