Skip to content

[release/11.0] Fix internal Helix pipeline credentials and queue selection #133938

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
akoeplinger merged 1 commit into from
Sep 21, 2026
Merged

[release/11.0] Fix internal Helix pipeline credentials and queue selection #133938

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion eng/pipelines/common/templates/wasi-wasm-coreclr-build-only.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
# src/tests CoreCLR runtime tests on Helix under wasmtime lives in
# wasi-wasm-coreclr-runtime-tests.yml (the 'wasi_wasm' Helix queue is
# already mapped to the ubuntu-26.04-helix-webassembly-amd64 image,
# which ships wasmtime — see eng/pipelines/libraries/helix-queues-setup.yml).
# which ships wasmtime — see eng/pipelines/coreclr/templates/helix-queues-setup.yml).
#
- template: /eng/pipelines/common/platform-matrix.yml
parameters:
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/common/templates/wasi-wasm-coreclr-runtime-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ jobs:
# testBuildArgs below).
#
# Merged-runner mode; xharness dispatches via helixpublishwitharcade.proj.
# Reuses the wasi_wasm helix queue (ubuntu-26.04-helix-webassembly-amd64).
# Reuses the CoreCLR browser/WASI Helix queue (ubuntu-26.04-helix-webassembly-amd64).
#

- template: /eng/pipelines/common/platform-matrix.yml
parameters:
jobTemplate: /eng/pipelines/common/global-build-job.yml
helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
buildConfig: Release
runtimeFlavor: coreclr
platforms: ${{ parameters.platforms }}
Expand Down
7 changes: 5 additions & 2 deletions eng/pipelines/coreclr/templates/helix-queues-setup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ jobs:
pool: ${{ parameters.pool }}
platform: ${{ parameters.platform }}
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}

# IMPORTANT: Select public/internal queue aliases explicitly. Runtime macros expand too late
# for helix.yml to strip the .Open suffix at template expansion time for internal runs.
helixQueues:

# iOS Simulator/Mac Catalyst arm64
Expand Down Expand Up @@ -67,8 +70,8 @@ jobs:
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- Ubuntu.2204.Amd64.Android.29

# Browser wasm
- ${{ if eq(parameters.platform, 'browser_wasm') }}:
# Browser and WASI wasm
- ${{ if in(parameters.platform, 'browser_wasm', 'wasi_wasm') }}:
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
- (Ubuntu.2604.Amd64.Open)AzureLinux.3.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-26.04-helix-webassembly-amd64@sha256:0be8725e08b6d0f58ec0290f3f3b70c449123e78b2b33853e9049df84b912fa8
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
Expand Down
13 changes: 11 additions & 2 deletions eng/pipelines/installer/helix-queues-setup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ steps:
osGroup: ${{ parameters.osGroup }}
osSubgroup: ${{ parameters.osSubgroup }}
useHelixMonitor: ${{ parameters.useHelixMonitor }}

# IMPORTANT: Select public/internal queue aliases explicitly. Runtime macros expand too late
# for helix.yml to strip the .Open suffix at template expansion time for internal runs.
helixQueues:

# Linux arm
Expand All @@ -42,11 +45,17 @@ steps:

# OSX arm64
- ${{ if eq(parameters.platform, 'osx_arm64') }}:
- $(helix_macos_arm64)
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
- $(helix_macos_arm64)
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- $(helix_macos_arm64_latest_internal)

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

# windows x64
- ${{ if eq(parameters.platform, 'windows_x64') }}:
Expand Down
38 changes: 31 additions & 7 deletions eng/pipelines/libraries/helix-queues-setup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ jobs:
pool: ${{ parameters.pool }}
platform: ${{ parameters.platform }}
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}

# IMPORTANT: Select public/internal queue aliases explicitly. Runtime macros expand too late
# for helix.yml to strip the .Open suffix at template expansion time for internal runs.
helixQueues:

# Linux arm
Expand Down Expand Up @@ -81,11 +84,17 @@ jobs:

# OSX arm64
- ${{ if eq(parameters.platform, 'osx_arm64') }}:
- $(helix_macos_arm64)
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
- $(helix_macos_arm64)
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- $(helix_macos_arm64_latest_internal)

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

# Android
# Use the Ubuntu-based Android queue for x86/x64/bionic_x64 on all projects,
Expand All @@ -101,19 +110,31 @@ jobs:

# iOS Simulator/Mac Catalyst arm64
- ${{ if in(parameters.platform, 'iossimulator_arm64', 'tvossimulator_arm64', 'maccatalyst_arm64') }}:
- $(helix_macos_ios_simulator_arm64)
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
- $(helix_macos_ios_simulator_arm64)
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- $(helix_macos_ios_simulator_arm64_internal)

# iOS/tvOS Simulator x64 & MacCatalyst x64
- ${{ if in(parameters.platform, 'iossimulator_x64', 'tvossimulator_x64', 'maccatalyst_x64') }}:
- $(helix_macos_ios_simulator_x64)
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
- $(helix_macos_ios_simulator_x64)
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- $(helix_macos_ios_simulator_x64_internal)

# iOS devices
- ${{ if in(parameters.platform, 'ios_arm64') }}:
- $(helix_macos_ios_device)
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
- $(helix_macos_ios_device)
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- $(helix_macos_ios_device_internal)

# tvOS devices
- ${{ if in(parameters.platform, 'tvos_arm64') }}:
- $(helix_macos_tvos_device)
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
- $(helix_macos_tvos_device)
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- $(helix_macos_tvos_device_internal)

# windows x64
- ${{ if eq(parameters.platform, 'windows_x64') }}:
Expand Down Expand Up @@ -190,6 +211,9 @@ jobs:

# Browser WebAssembly macOS
- ${{ if eq(parameters.platform, 'browser_wasm_mac') }}:
- $(helix_macos_arm64)
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
- $(helix_macos_arm64)
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- $(helix_macos_arm64_latest_internal)

${{ insert }}: ${{ parameters.jobParameters }}
2 changes: 1 addition & 1 deletion eng/pipelines/performance/perf.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ extends:
- stage: Build
variables:
# The standalone monitor does not inherit the submitter jobs' variable groups.
- ${{ if and(eq(variables['System.TeamProject'], 'internal'), ne(variables['Build.Reason'], 'PullRequest')) }}:
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- group: DotNet-HelixApi-Access
jobs:

Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/runtime.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ extends:
- stage: Build
variables:
# The standalone monitor does not inherit the submitter jobs' variable groups.
- ${{ if and(eq(variables['System.TeamProject'], 'internal'), ne(variables['Build.Reason'], 'PullRequest')) }}:
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- group: DotNet-HelixApi-Access
jobs:
- ${{ if eq(variables['enableHelixJobMonitor'], true) }}:
Expand Down
Loading