Skip to content

[release/10.0] Fix internal validation pipeline #123825

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

Open
jkoritzinsky wants to merge 1 commit into
base: release/10.0
Choose a base branch
from
+39 −73
Open

[release/10.0] Fix internal validation pipeline #123825

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
22 changes: 1 addition & 21 deletions eng/pipelines/common/global-build-job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,27 +172,7 @@ jobs:
- ${{ if and(eq(parameters.isOfficialBuild, true), notin(parameters.osGroup, 'osx', 'maccatalyst', 'ios', 'iossimulator', 'tvos', 'tvossimulator')) }}:
- template: /eng/pipelines/common/restore-internal-tools.yml

- ${{ if ne(variables['System.TeamProject'], 'public') }}:
- ${{ if and(ne(parameters.osGroup, 'windows'), ne(parameters.hostedOs, 'windows')) }}:
- task: Bash@3
displayName: Setup Private Feeds Credentials
inputs:
filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh
arguments: $(Build.SourcesDirectory)/NuGet.config $Token
env:
Token: $(dn-bot-dnceng-artifact-feeds-rw)
- ${{ else }}:
- task: PowerShell@2
displayName: Setup Private Feeds Credentials
inputs:
filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1
arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
env:
Token: $(dn-bot-dnceng-artifact-feeds-rw)
# Run the NuGetAuthenticate task after the internal feeds are added to the nuget.config
# This ensures that creds are set appropriately for all feeds in the config, and that the
# credential provider is installed.
- task: NuGetAuthenticate@1
- template: /eng/common/${{ parameters.templatePath }}/steps/enable-internal-sources.yml

- ${{ if in(parameters.osGroup, 'osx', 'maccatalyst', 'ios', 'iossimulator', 'tvos', 'tvossimulator') }}:
- script: $(Build.SourcesDirectory)/eng/common/native/install-dependencies.sh ${{ parameters.osGroup }}
Expand Down
2 changes: 2 additions & 0 deletions eng/pipelines/common/templates/runtimes/xplat-job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,4 +109,6 @@ jobs:
fetchDepth: $(checkoutFetchDepth)
fetchTags: false

- template: /eng/common/${{ parameters.templatePath }}/steps/enable-internal-sources.yml

- ${{ parameters.steps }}
35 changes: 28 additions & 7 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 @@ -34,31 +34,52 @@ jobs:

# iOS Simulator/Mac Catalyst arm64
- ${{ if in(parameters.platform, 'maccatalyst_arm64', 'iossimulator_arm64') }}:
- OSX.26.Arm64.Open
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
- OSX.15.Arm64.Open
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- OSX.15.Arm64

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

# Android arm64
- ${{ if in(parameters.platform, 'android_arm64') }}:
- Windows.11.Amd64.Android.Open
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
- Windows.11.Amd64.Android.Open
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- Windows.11.Amd64.Android

# Android x64
- ${{ if in(parameters.platform, 'android_x64') }}:
- Ubuntu.2204.Amd64.Android.29.Open
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
- Ubuntu.2204.Amd64.Android.29.Open
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- Ubuntu.2204.Amd64.Android.29

# Browser wasm
- ${{ if eq(parameters.platform, 'browser_wasm') }}:
- (Ubuntu.2404.Amd64)AzureLinux.3.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-24.04-helix-webassembly-amd64
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
- (Ubuntu.2404.Amd64)AzureLinux.3.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-24.04-helix-webassembly-amd64
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- (Ubuntu.2404.Amd64)AzureLinux.3.Amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-24.04-helix-webassembly-amd64

# iOS devices
- ${{ if in(parameters.platform, 'ios_arm64') }}:
- OSX.15.Amd64.Iphone.Open
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
- OSX.15.Amd64.Iphone.Open
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- osx.15.amd64.iphone

# tvOS devices
- ${{ if in(parameters.platform, 'tvos_arm64') }}:
- OSX.15.Amd64.AppleTV.Open
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
- OSX.15.Amd64.AppleTV.Open
Copy link

Copilot AI Jan 30, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Inconsistent indentation on this line. The list item should be indented with 8 spaces to align with other queue entries in the file (see lines 73, 75, 82, etc.), but this line has 10 spaces.

Suggested change
- OSX.15.Amd64.AppleTV.Open
- OSX.15.Amd64.AppleTV.Open

Copilot uses AI. Check for mistakes.
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- osx.15.amd64.appletv

# Linux arm
- ${{ if eq(parameters.platform, 'linux_arm') }}:
Expand Down
22 changes: 1 addition & 21 deletions eng/pipelines/diagnostics/runtime-diag-job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,27 +142,7 @@ jobs:
- ${{ if and(eq(parameters.isOfficialBuild, true), notin(parameters.osGroup, 'osx', 'maccatalyst', 'ios', 'iossimulator', 'tvos', 'tvossimulator')) }}:
- template: /eng/pipelines/common/restore-internal-tools.yml

- ${{ if ne(variables['System.TeamProject'], 'public') }}:
- ${{ if and(ne(parameters.osGroup, 'windows'), ne(parameters.hostedOs, 'windows')) }}:
- task: Bash@3
displayName: Setup Private Feeds Credentials
inputs:
filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh
arguments: $(Build.SourcesDirectory)/NuGet.config $Token
env:
Token: $(dn-bot-dnceng-artifact-feeds-rw)
- ${{ else }}:
- task: PowerShell@2
displayName: Setup Private Feeds Credentials
inputs:
filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1
arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
env:
Token: $(dn-bot-dnceng-artifact-feeds-rw)
# Run the NuGetAuthenticate task after the internal feeds are added to the nuget.config
# This ensures that creds are set appropriately for all feeds in the config, and that the
# credential provider is installed.
- task: NuGetAuthenticate@1
- template: /eng/common/${{ parameters.templatePath }}/steps/enable-internal-sources.yml

- ${{ if in(parameters.osGroup, 'osx', 'maccatalyst', 'ios', 'iossimulator', 'tvos', 'tvossimulator') }}:
- script: $(Build.SourcesDirectory)/eng/common/native/install-dependencies.sh ${{ parameters.osGroup }}
Expand Down
6 changes: 4 additions & 2 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 @@ -85,9 +85,11 @@ jobs:
- OSX.15.Amd64.Open

# Android
- ${{ if in(parameters.platform, 'android_x86', 'android_x64', 'linux_bionic_x64') }}:
# Always use the Ubuntu-based Android queue for internal validation as there is no internal equivalent of
# the Windows.11.Amd64.Android.Open queue.
- ${{ if or(eq(variables['System.TeamProject'], 'internal'), in(parameters.platform, 'android_x86', 'android_x64', 'linux_bionic_x64')) }}:
- Ubuntu.2204.Amd64.Android.29.Open
Copy link
Member

@hoyosjs hoyosjs Jan 31, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are we using open queues in internal?

Copy link
Member Author

@jkoritzinsky jkoritzinsky Jan 31, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We strip the .Open name in the libraries infra, so I wanted to keep consistent (Open queues don't actually work from internal branches). Technically I think we can drop the .Open here.

- ${{ if in(parameters.platform, 'android_arm', 'android_arm64', 'linux_bionic_arm', 'linux_bionic_arm64') }}:
- ${{ if and(eq(variables['System.TeamProject'], 'public'), in(parameters.platform, 'android_arm', 'android_arm64', 'linux_bionic_arm', 'linux_bionic_arm64')) }}:
- Windows.11.Amd64.Android.Open

# iOS Simulator/Mac Catalyst arm64
Expand Down
25 changes: 3 additions & 22 deletions eng/pipelines/libraries/run-test-job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,10 @@ parameters:
helixArtifactsName: ''
unifiedBuildNameSuffix: ''
unifiedBuildConfigOverride: ''
templatePath: 'templates'

jobs:
- template: /eng/common/templates/job/job.yml
- template: /eng/common/${{ parameters.templatePath }}/job/job.yml
parameters:
enablePublishBuildArtifacts: true
timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
Expand Down Expand Up @@ -88,27 +89,7 @@ jobs:
fetchDepth: $(checkoutFetchDepth)
fetchTags: false

- ${{ if ne(variables['System.TeamProject'], 'public') }}:
- ${{ if ne(parameters.osGroup, 'windows') }}:
- task: Bash@3
displayName: Setup Private Feeds Credentials
inputs:
filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh
arguments: $(Build.SourcesDirectory)/NuGet.config $Token
env:
Token: $(dn-bot-dnceng-artifact-feeds-rw)
- ${{ if eq(parameters.osGroup, 'windows') }}:
- task: PowerShell@2
displayName: Setup Private Feeds Credentials
inputs:
filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1
arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
env:
Token: $(dn-bot-dnceng-artifact-feeds-rw)
# Run the NuGetAuthenticate task after the internal feeds are added to the nuget.config
# This ensures that creds are set appropriately for all feeds in the config, and that the
# credential provider is installed.
- task: NuGetAuthenticate@1
- template: /eng/common/${{ parameters.templatePath }}/steps/enable-internal-sources.yml

- ${{ if in(parameters.osGroup, 'osx', 'maccatalyst', 'ios', 'iossimulator', 'tvos', 'tvossimulator') }}:
- script: $(Build.SourcesDirectory)/eng/common/native/install-dependencies.sh ${{ parameters.osGroup }}
Expand Down
Loading