Skip to content

Commit b6f30ed

Browse files
richlanderrichlander
authored
[9.0] Update CI OSes (#115503)
* [0.0] Update CI OSes * Update to match main * Switch to CentOS Stream 9 * Update bad yaml * Update VMs and container references * Update Alma Linux 9 image * Add Mariner 2.0 back * Switch back to older Alpine for older LLVM * Removing conditions from linux-musl-x64 legs * Apply changes from main and release/8.0-staging * Match outerloop to main * Update queue typo
1 parent f377282 commit b6f30ed

File tree

3 files changed

+45
-54
lines changed

3 files changed

+45
-54
lines changed

‎eng/pipelines/common/templates/pipeline-with-resources.yml‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,6 @@ extends:
2121
env:
2222
ROOTFS_DIR: /crossrootfs/arm
2323

24-
linux_armv6:
25-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04-cross-armv6-raspbian-10
26-
env:
27-
ROOTFS_DIR: /crossrootfs/armv6
28-
2924
linux_arm64:
3025
image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-cross-arm64
3126
env:
@@ -72,7 +67,7 @@ extends:
7267
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04
7368

7469
linux_musl_x64_dev_innerloop:
75-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode
70+
image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.21-amd64
7671

7772
linux_x64_sanitizer:
7873
image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-cross-amd64-sanitizer
@@ -84,7 +79,7 @@ extends:
8479
image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9
8580
# AlmaLinux 8 is a RHEL 8 rebuild, so we use it to test building from source on RHEL 8.
8681
SourceBuild_linux_x64:
87-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:almalinux-8-source-build
82+
image: mcr.microsoft.com/dotnet-buildtools/prereqs:almalinux-9-source-build-amd64
8883

8984
linux_s390x:
9085
image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-cross-s390x

‎eng/pipelines/coreclr/templates/helix-queues-setup.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -70,37 +70,37 @@ jobs:
7070
# Linux arm64
7171
- ${{ if eq(parameters.platform, 'linux_arm64') }}:
7272
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
73-
- (Ubuntu.2004.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:ubuntu-20.04-helix-arm64v8
73+
- (Ubuntu.2204.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:ubuntu-22.04-helix-arm64v8
7474
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
75-
- (Ubuntu.2004.Arm64)[email protected]/dotnet-buildtools/prereqs:ubuntu-20.04-helix-arm64v8
75+
- (Ubuntu.2204.Arm64)[email protected]/dotnet-buildtools/prereqs:ubuntu-22.04-helix-arm64v8
7676

7777
# Linux musl x64
7878
- ${{ if eq(parameters.platform, 'linux_musl_x64') }}:
7979
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
80-
- (Alpine.321.Amd64.Open)Ubuntu.2204[email protected]/dotnet-buildtools/prereqs:alpine-3.21-helix-amd64
80+
- (Alpine.322.Amd64.Open)AzureLinux.3[email protected]/dotnet-buildtools/prereqs:alpine-3.22-helix-amd64
8181
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
82-
- (Alpine.321.Amd64)Ubuntu.2204[email protected]/dotnet-buildtools/prereqs:alpine-3.21-helix-amd64
82+
- (Alpine.322.Amd64)AzureLinux.3[email protected]/dotnet-buildtools/prereqs:alpine-3.22-helix-amd64
8383

8484
# Linux musl arm32
8585
- ${{ if eq(parameters.platform, 'linux_musl_arm') }}:
8686
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
87-
- (Alpine.321.Arm32.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.21-helix-arm32v7
87+
- (Alpine.322.Arm32.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.22-helix-arm32v7
8888
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
89-
- (Alpine.321.Arm32)[email protected]/dotnet-buildtools/prereqs:alpine-3.21-helix-arm32v7
89+
- (Alpine.322.Arm32)[email protected]/dotnet-buildtools/prereqs:alpine-3.22-helix-arm32v7
9090

9191
# Linux musl arm64
9292
- ${{ if eq(parameters.platform, 'linux_musl_arm64') }}:
9393
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
94-
- (Alpine.320.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.20-helix-arm64v8
94+
- (Alpine.322.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.22-helix-arm64v8
9595
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
96-
- (Alpine.320.Arm64)[email protected]/dotnet-buildtools/prereqs:alpine-3.20-helix-arm64v8
96+
- (Alpine.322.Arm64)[email protected]/dotnet-buildtools/prereqs:alpine-3.22-helix-arm64v8
9797

9898
# Linux x64
9999
- ${{ if eq(parameters.platform, 'linux_x64') }}:
100100
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
101-
- Ubuntu.2204.Amd64.Open
101+
- AzureLinux.3.Amd64.Open
102102
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
103-
- Ubuntu.2204.Amd64
103+
- AzureLinux.3.Amd64
104104

105105
# OSX arm64
106106
- ${{ if eq(parameters.platform, 'osx_arm64') }}:

‎eng/pipelines/libraries/helix-queues-setup.yml‎

Lines changed: 33 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -27,53 +27,49 @@ jobs:
2727
- ${{ if eq(parameters.platform, 'linux_arm') }}:
2828
- ${{ if or(eq(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
2929
- (Debian.12.Arm32.Open)[email protected]/dotnet-buildtools/prereqs:debian-12-helix-arm32v7
30-
31-
# Linux armv6
32-
- ${{ if eq(parameters.platform, 'linux_armv6') }}:
33-
- (Raspbian.10.Armv6.Open)[email protected]/dotnet-buildtools/prereqs:raspbian-10-helix-arm32v6
34-
3530
# Linux arm64
3631
- ${{ if eq(parameters.platform, 'linux_arm64') }}:
37-
- (Ubuntu.2204.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:ubuntu-22.04-helix-arm64v8
32+
- ${{ if or(eq(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
33+
- (Ubuntu.2204.ArmArch.Open)[email protected]/dotnet-buildtools/prereqs:ubuntu-22.04-helix-arm64v8
3834
- ${{ if or(ne(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
39-
- (Debian.12.Arm64.Open)Ubuntu.2204.Armarch[email protected]/dotnet-buildtools/prereqs:debian-12-helix-arm64v8
35+
- (AzureLinux.3.0.ArmArch.Open)Ubuntu.2204.ArmArch[email protected]/dotnet-buildtools/prereqs:azurelinux-3.0-helix-arm64v8
4036

4137
# Linux musl x64
4238
- ${{ if eq(parameters.platform, 'linux_musl_x64') }}:
43-
- ${{ if or(ne(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
44-
- (Alpine.321.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.21-helix-amd64
45-
- ${{ if or(eq(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
46-
- (Alpine.321.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.21-helix-amd64
39+
- (Alpine.322.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.22-helix-amd64
4740

4841
# Linux musl arm64
49-
- ${{ if and(eq(parameters.platform, 'linux_musl_arm64'), or(eq(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true))) }}:
50-
- (Alpine.320.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.20-helix-arm64v8
42+
- ${{ if eq(parameters.platform, 'linux_musl_arm64') }}:
43+
- ${{ if or(eq(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
44+
- (Alpine.322.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.22-helix-arm64v8
45+
5146

5247
# Linux x64
5348
- ${{ if eq(parameters.platform, 'linux_x64') }}:
54-
- ${{ if and(eq(parameters.jobParameters.interpreter, ''), ne(parameters.jobParameters.isSingleFile, true)) }}:
55-
- ${{ if and(eq(parameters.jobParameters.testScope, 'outerloop'), eq(parameters.jobParameters.runtimeFlavor, 'mono')) }}:
56-
- SLES.15.Amd64.Open
57-
- (Centos.9.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:centos-stream9-helix
58-
- (Fedora.41.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:fedora-41-helix
59-
- (Ubuntu.2204.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:ubuntu-22.04-helix-amd64
60-
- (Debian.12.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:debian-12-helix-amd64
61-
- ${{ if or(ne(parameters.jobParameters.testScope, 'outerloop'), ne(parameters.jobParameters.runtimeFlavor, 'mono')) }}:
62-
- ${{ if or(eq(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
63-
- SLES.15.Amd64.Open
64-
- (Fedora.41.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:fedora-41-helix
65-
- Ubuntu.2204.Amd64.Open
66-
- (Debian.12.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:debian-12-helix-amd64
67-
- (Mariner.2.0.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:cbl-mariner-2.0-helix-amd64
68-
- (AzureLinux.3.0.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:azurelinux-3.0-helix-amd64
69-
- (openSUSE.15.6.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:opensuse-15.6-helix-amd64
70-
- ${{ if or(ne(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
71-
- (Centos.9.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:centos-stream9-helix
72-
- (Debian.12.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:debian-12-helix-amd64
73-
- Ubuntu.2204.Amd64.Open
7449
- ${{ if or(eq(parameters.jobParameters.interpreter, 'true'), eq(parameters.jobParameters.isSingleFile, true)) }}:
7550
# Limiting interp runs as we don't need as much coverage.
76-
- (Debian.12.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:debian-12-helix-amd64
51+
- (Debian.12.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:debian-12-helix-amd64
52+
53+
- ${{ else }}:
54+
- ${{ if eq(parameters.jobParameters.runtimeFlavor, 'mono') }}:
55+
# Mono path - test minimal scenario
56+
- Ubuntu.2204.Amd64.Open
57+
- ${{ else }}:
58+
# CoreCLR path
59+
- ${{ if and(eq(parameters.jobParameters.isExtraPlatformsBuild, true), ne(parameters.jobParameters.testScope, 'outerloop'))}}:
60+
# extra-platforms CoreCLR (inner loop only)
61+
- (Debian.12.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:debian-12-helix-amd64
62+
- (Mariner.2.0.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:cbl-mariner-2.0-helix-amd64
63+
64+
- ${{ if eq(parameters.jobParameters.testScope, 'outerloop') }}:
65+
# outerloop only CoreCLR
66+
- AzureLinux.3.Amd64.Open
67+
68+
- ${{ if or(ne(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true))}}:
69+
# inner and outer loop CoreCLR (general set)
70+
- Ubuntu.2204.Amd64.Open
71+
- (AzureLinux.3.0.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:azurelinux-3.0-helix-amd64
72+
- (Centos.10.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:centos-stream-10-helix-amd64
7773

7874
# OSX arm64
7975
- ${{ if eq(parameters.platform, 'osx_arm64') }}:
@@ -156,15 +152,15 @@ jobs:
156152

157153
# WASI
158154
- ${{ if eq(parameters.platform, 'wasi_wasm') }}:
159-
- (Ubuntu.2204.Amd64)Ubuntu.2204[email protected]/dotnet-buildtools/prereqs:ubuntu-22.04-helix-webassembly
155+
- (Ubuntu.2204.Amd64)AzureLinux.3[email protected]/dotnet-buildtools/prereqs:ubuntu-22.04-helix-webassembly
160156

161157
# Browser WebAssembly
162158
- ${{ if eq(parameters.platform, 'browser_wasm') }}:
163-
- (Ubuntu.2204.Amd64)Ubuntu.2204[email protected]/dotnet-buildtools/prereqs:ubuntu-22.04-helix-webassembly
159+
- (Ubuntu.2204.Amd64)AzureLinux.3[email protected]/dotnet-buildtools/prereqs:ubuntu-22.04-helix-webassembly
164160

165161
# Browser WebAssembly Firefox
166162
- ${{ if eq(parameters.platform, 'browser_wasm_firefox') }}:
167-
- (Ubuntu.2204.Amd64)Ubuntu.2204[email protected]/dotnet-buildtools/prereqs:ubuntu-22.04-helix-webassembly
163+
- (Ubuntu.2204.Amd64)AzureLinux.3[email protected]/dotnet-buildtools/prereqs:ubuntu-22.04-helix-webassembly
168164

169165
# Browser WebAssembly windows
170166
- ${{ if in(parameters.platform, 'browser_wasm_win', 'wasi_wasm_win') }}:

0 commit comments

Comments
 (0)