-
Notifications
You must be signed in to change notification settings - Fork 4.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[release/6.0] Update arm queues (#81858)
* Update arm queues * Also update Ubuntu 16.04 arm queues * Use 18.04 open helix queues we used in the 7.0 PR, instead of 16.04 --------- Co-authored-by: Carlos Sanchez <[email protected]>
- Loading branch information
1 parent
0e280c4
commit c6d0daf
Showing
3 changed files
with
20 additions
and
20 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -45,23 +45,23 @@ jobs: | |
| # Linux arm | ||
| - ${{ if eq(parameters.platform, 'Linux_arm') }}: | ||
| - ${{ if eq(variables['System.TeamProject'], 'public') }}: | ||
| - (Ubuntu.1804.Arm32.Open)[email protected]/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm32v7-bfcd90a-20200121150440 | ||
| - (Ubuntu.1804.Arm32.Open)[email protected]/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm32v7 | ||
| - ${{ if eq(variables['System.TeamProject'], 'internal') }}: | ||
| - (Debian.10.Arm32)[email protected]/dotnet-buildtools/prereqs:debian-10-helix-arm32v7-20210304164340-6616c63 | ||
| - (Debian.11.Arm32)[email protected]/dotnet-buildtools/prereqs:debian-11-helix-arm32v7-20210304164347-5a7c380 | ||
| - (Ubuntu.1804.Arm32)[email protected]/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm32v7-bfcd90a-20200121150440 | ||
| - (Ubuntu.1804.Arm32)[email protected]/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm32v7 | ||
|
|
||
| # Linux arm64 | ||
| - ${{ if eq(parameters.platform, 'Linux_arm64') }}: | ||
| - ${{ if eq(variables['System.TeamProject'], 'public') }}: | ||
| - (Ubuntu.1804.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm64v8-20210531091519-97d8652 | ||
| - (Ubuntu.1804.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm64v8 | ||
| - ${{ if and(eq(variables['System.TeamProject'], 'public'), notIn(parameters.jobParameters.helixQueueGroup, 'pr', 'ci', 'libraries')) }}: | ||
| - (Debian.10.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:debian-10-helix-arm64v8-20210304164340-56c6673 | ||
| - (Debian.11.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:debian-11-helix-arm64v8-20210304164340-5a7c380 | ||
| - ${{ if eq(variables['System.TeamProject'], 'internal') }}: | ||
| - (Debian.10.Arm64)[email protected]/dotnet-buildtools/prereqs:debian-10-helix-arm64v8-20210304164340-56c6673 | ||
| - (Debian.11.Arm64)[email protected]/dotnet-buildtools/prereqs:debian-11-helix-arm64v8-20210304164340-5a7c380 | ||
| - (Ubuntu.1804.Arm64)[email protected]/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm64v8-20210531091519-97d8652 | ||
| - (Ubuntu.1804.Arm64)[email protected]/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm64v8 | ||
|
|
||
| # Linux musl x64 | ||
| - ${{ if eq(parameters.platform, 'Linux_musl_x64') }}: | ||
|
|
@@ -73,16 +73,16 @@ jobs: | |
| # Linux musl arm32 | ||
| - ${{ if eq(parameters.platform, 'Linux_musl_arm') }}: | ||
| - ${{ if eq(variables['System.TeamProject'], 'public') }}: | ||
| - (Alpine.314.Arm32.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.14-helix-arm32v7-20210910135806-8a6f4f3 | ||
| - (Alpine.314.Arm32.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.14-helix-arm32v7 | ||
| - ${{ if eq(variables['System.TeamProject'], 'internal') }}: | ||
| - (Alpine.314.Arm32)[email protected]/dotnet-buildtools/prereqs:alpine-3.14-helix-arm32v7-20210910135806-8a6f4f3 | ||
| - (Alpine.314.Arm32)[email protected]/dotnet-buildtools/prereqs:alpine-3.14-helix-arm32v7 | ||
|
|
||
| # Linux musl arm64 | ||
| - ${{ if eq(parameters.platform, 'Linux_musl_arm64') }}: | ||
| - ${{ if eq(variables['System.TeamProject'], 'public') }}: | ||
| - (Alpine.314.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.14-helix-arm64v8-20210910135810-8a6f4f3 | ||
| - (Alpine.314.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.14-helix-arm64v8 | ||
| - ${{ if eq(variables['System.TeamProject'], 'internal') }}: | ||
| - (Alpine.314.Arm64)[email protected]/dotnet-buildtools/prereqs:alpine-3.14-helix-arm64v8-20210910135810-8a6f4f3 | ||
| - (Alpine.314.Arm64)[email protected]/dotnet-buildtools/prereqs:alpine-3.14-helix-arm64v8 | ||
|
|
||
| # Linux x64 | ||
| - ${{ if eq(parameters.platform, 'Linux_x64') }}: | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -35,9 +35,9 @@ jobs: | |
| # Linux arm64 | ||
| - ${{ if eq(parameters.platform, 'Linux_arm64') }}: | ||
| - ${{ if eq(parameters.jobParameters.isFullMatrix, true) }}: | ||
| - (Ubuntu.1804.ArmArch.Open)Ubuntu.1804.ArmArch[email protected]/dotnet-buildtools/prereqs:ubuntu-16.04-helix-arm64v8-20210106155927-56c6673 | ||
| - (Ubuntu.1804.Arm64.Open)Ubuntu.1804.Armarch[email protected]/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm64v8-20230201170341-8b7d579 | ||
| - ${{ if eq(parameters.jobParameters.isFullMatrix, false) }}: | ||
| - (Ubuntu.1804.ArmArch.Open)Ubuntu.1804.ArmArch[email protected]/dotnet-buildtools/prereqs:ubuntu-16.04-helix-arm64v8-20210106155927-56c6673 | ||
| - (Ubuntu.1804.Arm64.Open)Ubuntu.1804.Armarch[email protected]/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm64v8-20230201170341-8b7d579 | ||
|
|
||
| # Linux musl x64 | ||
| - ${{ if eq(parameters.platform, 'Linux_musl_x64') }}: | ||
|
|
@@ -47,8 +47,8 @@ jobs: | |
|
|
||
| # Linux musl arm64 | ||
| - ${{ if and(eq(parameters.platform, 'Linux_musl_arm64'), eq(parameters.jobParameters.isFullMatrix, true)) }}: | ||
| - (Alpine.313.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.13-helix-arm64v8-20210910135808-8a6f4f3 | ||
| - (Alpine.314.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.14-helix-arm64v8-20210910135810-8a6f4f3 | ||
| - (Alpine.313.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.13-helix-arm64v8 | ||
| - (Alpine.314.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.14-helix-arm64v8 | ||
|
|
||
| # Linux x64 | ||
| - ${{ if eq(parameters.platform, 'Linux_x64') }}: | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -23,12 +23,12 @@ | |
| # 4. Lastly, it sets the pipeline variables. | ||
|
|
||
| # Below are the helix queues it sets depending on the OS/architecture: | ||
| # | Arch | windows | Linux | | ||
| # |-------|----------------------|--------------------------------------------------------------------------------------------------------------------------------------| | ||
| # | x86 | Windows.10.Amd64.X86 | | | ||
| # | x64 | Windows.10.Amd64.X86 | Ubuntu.1804.Amd64 | | ||
| # | arm | - | (Ubuntu.1804.Arm32)[email protected]/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm32v7-bfcd90a-20200121150440 | | ||
| # | arm64 | Windows.10.Arm64 | (Ubuntu.1804.Arm64)[email protected]/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm64v8-20210531091519-97d8652 | | ||
| # | Arch | windows | Linux | | ||
| # |-------|----------------------|---------------------------------------------------------------------------------------------------------------| | ||
| # | x86 | Windows.10.Amd64.X86 | | | ||
| # | x64 | Windows.10.Amd64.X86 | Ubuntu.1804.Amd64 | | ||
| # | arm | - | (Ubuntu.1804.Arm32)[email protected]/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm32v7 | | ||
| # | arm64 | Windows.10.Arm64 | (Ubuntu.1804.Arm64)[email protected]/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm64v8 | | ||
| ################################################################################ | ||
| ################################################################################ | ||
|
|
||
|
|
@@ -490,9 +490,9 @@ def main(main_args): | |
| helix_queue = "Windows.10.Arm64" if arch == "arm64" else "Windows.10.Amd64.X86" | ||
| else: | ||
| if arch == "arm": | ||
| helix_queue = "(Ubuntu.1804.Arm32)[email protected]/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm32v7-bfcd90a-20200121150440" | ||
| helix_queue = "(Ubuntu.1804.Arm32)[email protected]/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm32v7-20230201170255-8b7d579" | ||
| elif arch == "arm64": | ||
| helix_queue = "(Ubuntu.1804.Arm64)[email protected]/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm64v8-20210531091519-97d8652" | ||
| helix_queue = "(Ubuntu.1804.Arm64)[email protected]/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm64v8" | ||
| else: | ||
| helix_queue = "Ubuntu.1804.Amd64" | ||
|
|
||
|
|
||