Skip to content

[release/6.0] Update helix queues #64721

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
safern merged 3 commits into from
Feb 5, 2022
Merged

[release/6.0] Update helix queues #64721

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fc2f2f4
[release/6.0] Update helix queues
safern Feb 3, 2022
c63894d
Update more queues
safern Feb 3, 2022
70ddb17
Use server 2022
safern Feb 4, 2022
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
9 changes: 2 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 @@ -111,14 +111,9 @@ jobs:

# OSX x64
- ${{ if eq(parameters.platform, 'OSX_x64') }}:
- ${{ if and(eq(variables['System.TeamProject'], 'public'), in(parameters.jobParameters.helixQueueGroup, 'pr', 'ci', 'libraries')) }}:
- OSX.1013.Amd64.Open
- ${{ if and(eq(variables['System.TeamProject'], 'public'), notIn(parameters.jobParameters.helixQueueGroup, 'pr', 'ci', 'libraries')) }}:
- OSX.1013.Amd64.Open
- OSX.1014.Amd64.Open
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
- OSX.1015.Amd64.Open
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- OSX.1013.Amd64
- OSX.1014.Amd64
- OSX.1015.Amd64

# windows x64
Expand Down
22 changes: 9 additions & 13 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 @@ -92,10 +92,6 @@ jobs:

# OSX x64
- ${{ if eq(parameters.platform, 'OSX_x64') }}:
- ${{ if eq(parameters.jobParameters.isFullMatrix, true) }}:
- OSX.1014.Amd64.Open
- OSX.1015.Amd64.Open
- ${{ if eq(parameters.jobParameters.isFullMatrix, false) }}:
- OSX.1015.Amd64.Open

# Android
Expand Down Expand Up @@ -126,27 +122,27 @@ jobs:
- ${{ if notIn(parameters.jobParameters.framework, 'net48') }}:
- ${{ if and(eq(parameters.jobParameters.testScope, 'outerloop'), eq(parameters.jobParameters.runtimeFlavor, 'mono')) }}:
- Windows.81.Amd64.Open
- Windows.10.Amd64.Server19H1.Open
- Windows.Amd64.Server2022.Open
- ${{ if or(ne(parameters.jobParameters.testScope, 'outerloop'), ne(parameters.jobParameters.runtimeFlavor, 'mono')) }}:
- ${{ if eq(parameters.jobParameters.isFullMatrix, true) }}:
- Windows.81.Amd64.Open
- Windows.10.Amd64.ServerRS5.Open
- Windows.10.Amd64.Server19H1.Open
- Windows.Amd64.Server2022.Open
- ${{ if ne(parameters.jobParameters.runtimeFlavor, 'mono') }}:
- (Windows.Nano.1809.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:nanoserver-1809-helix-amd64-08e8e40-20200107182504
- (Windows.Server.Core.1909.Amd64.Open)windows.10.amd64.server20h1[email protected]/dotnet-buildtools/prereqs:windowsservercore-2004-helix-amd64-20200904200251-272704c
- (Windows.Server.Core.1909.Amd64.Open)windows.10.amd64.server20H2[email protected]/dotnet-buildtools/prereqs:windowsservercore-2004-helix-amd64-20200904200251-272704c
- ${{ if ne(parameters.jobParameters.isFullMatrix, true) }}:
- Windows.81.Amd64.Open
- Windows.10.Amd64.Server19H1.ES.Open
- Windows.11.Amd64.ClientPre.Open
- ${{ if eq(parameters.jobParameters.testScope, 'outerloop') }}:
- (Windows.Server.Core.1909.Amd64.Open)windows.10.amd64.server20h1[email protected]/dotnet-buildtools/prereqs:windowsservercore-2004-helix-amd64-20200904200251-272704c
- (Windows.Server.Core.1909.Amd64.Open)windows.10.amd64.server20H2[email protected]/dotnet-buildtools/prereqs:windowsservercore-2004-helix-amd64-20200904200251-272704c
- ${{ if ne(parameters.jobParameters.runtimeFlavor, 'mono') }}:
- (Windows.Nano.1809.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:nanoserver-1809-helix-amd64-08e8e40-20200107182504

# .NETFramework
- ${{ if eq(parameters.jobParameters.framework, 'net48') }}:
- Windows.10.Amd64.Client19H1.Open
- Windows.10.Amd64.Client21H1.Open

# windows x86
- ${{ if eq(parameters.platform, 'windows_x86') }}:
Expand All @@ -159,17 +155,17 @@ jobs:
- ${{ if eq(parameters.jobParameters.isFullMatrix, true) }}:
- Windows.7.Amd64.Open
- Windows.10.Amd64.ServerRS5.Open
- Windows.10.Amd64.Server19H1.Open
- Windows.10.Amd64.Server20H2.Open
- ${{ if ne(parameters.jobParameters.isFullMatrix, true) }}:
- ${{ if eq(parameters.jobParameters.buildConfig, 'Release') }}:
- Windows.10.Amd64.Server19H1.ES.Open
- ${{ if eq(parameters.jobParameters.buildConfig, 'Debug') }}:
- Windows.7.Amd64.Open
- Windows.10.Amd64.Server19H1.Open
- Windows.10.Amd64.Server20H2.Open

# .NETFramework
- ${{ if eq(parameters.jobParameters.framework, 'net48') }}:
- Windows.10.Amd64.Client19H1.Open
- Windows.10.Amd64.Client21H1.Open

# windows arm
- ${{ if eq(parameters.platform, 'windows_arm') }}:
Expand All @@ -185,6 +181,6 @@ jobs:

# WebAssembly windows
- ${{ if eq(parameters.platform, 'Browser_wasm_win') }}:
- (Windows.Server.Core.1909.Amd64.Open)windows.10.amd64.server20h1[email protected]/dotnet-buildtools/prereqs:windowsservercore-2004-helix-webassembly-amd64-20210702131541-6837048
- (Windows.Server.Core.1909.Amd64.Open)windows.10.amd64.server20H2[email protected]/dotnet-buildtools/prereqs:windowsservercore-2004-helix-webassembly-amd64-20210702131541-6837048

${{ insert }}: ${{ parameters.jobParameters }}