Skip to content

Commit 3fad07c

Browse files
richlanderrichlander
authored
Update EOL versions
1 parent 6355683 commit 3fad07c

File tree

2 files changed

+46
-47
lines changed

2 files changed

+46
-47
lines changed

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

+26-26
Original file line numberDiff line numberDiff line change
@@ -36,68 +36,68 @@ jobs:
3636

3737
# Android x64
3838
- ${{ if in(parameters.platform, 'Android_x64') }}:
39-
- Ubuntu.1804.Amd64.Android.29.Open
39+
- Ubuntu.2204.Amd64.Android.29.Open
4040

4141
# Browser wasm
4242
- ${{ if eq(parameters.platform, 'Browser_wasm') }}:
43-
- Ubuntu.1804.Amd64.Open
43+
- Ubuntu.2204.Amd64.Open
4444

4545
# Linux arm
4646
- ${{ if eq(parameters.platform, 'Linux_arm') }}:
4747
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
48-
- (Ubuntu.1804.Arm32.Open)Ubuntu.1804[email protected]/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm32v7
48+
- (Ubuntu.2004.Arm32.Open)Ubuntu.2204[email protected]/dotnet-buildtools/prereqs:ubuntu-20.04-helix-arm32v7
4949
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
50-
- (Debian.10.Arm32)Ubuntu.1804[email protected]/dotnet-buildtools/prereqs:debian-10-helix-arm32v7
51-
- (Debian.11.Arm32)Ubuntu.1804[email protected]/dotnet-buildtools/prereqs:debian-11-helix-arm32v7
52-
- (Ubuntu.1804.Arm32)Ubuntu.1804[email protected]/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm32v7
50+
- (Debian.12.Arm32)Ubuntu.2204[email protected]/dotnet-buildtools/prereqs:debian-12-helix-arm32v7
51+
- (Debian.11.Arm32)Ubuntu.2204[email protected]/dotnet-buildtools/prereqs:debian-11-helix-arm32v7
52+
- (Ubuntu.2004.Arm32)Ubuntu.2204[email protected]/dotnet-buildtools/prereqs:ubuntu-20.04-helix-arm32v7
5353

5454
# Linux arm64
5555
- ${{ if eq(parameters.platform, 'Linux_arm64') }}:
5656
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
57-
- (Ubuntu.1804.Arm64.Open)Ubuntu.1804[email protected]/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm64v8
57+
- (Ubuntu.2004.Arm64.Open)Ubuntu.2204[email protected]/dotnet-buildtools/prereqs:ubuntu-20.04-helix-arm64v8
5858
- ${{ if and(eq(variables['System.TeamProject'], 'public'), notIn(parameters.jobParameters.helixQueueGroup, 'pr', 'ci', 'libraries')) }}:
59-
- (Debian.10.Arm64.Open)Ubuntu.1804[email protected]/dotnet-buildtools/prereqs:debian-10-helix-arm64v8
60-
- (Debian.11.Arm64.Open)Ubuntu.1804[email protected]/dotnet-buildtools/prereqs:debian-11-helix-arm64v8
59+
- (Debian.12.Arm64.Open)Ubuntu.2204[email protected]/dotnet-buildtools/prereqs:debian-12-helix-arm64v8
60+
- (Debian.11.Arm64.Open)Ubuntu.2204[email protected]/dotnet-buildtools/prereqs:debian-11-helix-arm64v8
6161
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
62-
- (Debian.10.Arm64)Ubuntu.1804[email protected]/dotnet-buildtools/prereqs:debian-10-helix-arm64v8
63-
- (Debian.11.Arm64)Ubuntu.1804[email protected]/dotnet-buildtools/prereqs:debian-11-helix-arm64v8
64-
- (Ubuntu.1804.Arm64)Ubuntu.1804[email protected]/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm64v8
62+
- (Debian.12.Arm64)Ubuntu.2204[email protected]/dotnet-buildtools/prereqs:debian-12-helix-arm64v8
63+
- (Debian.11.Arm64)Ubuntu.2204[email protected]/dotnet-buildtools/prereqs:debian-11-helix-arm64v8
64+
- (Ubuntu.2004.Arm64)Ubuntu.2204[email protected]/dotnet-buildtools/prereqs:ubuntu-20.04-helix-arm64v8
6565

6666
# Linux musl x64
6767
- ${{ if eq(parameters.platform, 'Linux_musl_x64') }}:
6868
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
69-
- (Alpine.314.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.14-helix-amd64
69+
- (Alpine.318.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.18-helix-amd64
7070
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
71-
- (Alpine.314.Amd64)[email protected]/dotnet-buildtools/prereqs:alpine-3.14-helix-amd64
71+
- (Alpine.318.Amd64)[email protected]/dotnet-buildtools/prereqs:alpine-3.18-helix-amd64
7272

7373
# Linux musl arm32
7474
- ${{ if eq(parameters.platform, 'Linux_musl_arm') }}:
7575
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
76-
- (Alpine.314.Arm32.Open)Ubuntu.1804[email protected]/dotnet-buildtools/prereqs:alpine-3.14-helix-arm32v7
76+
- (Alpine.318.Arm32.Open)Ubuntu.2204[email protected]/dotnet-buildtools/prereqs:alpine-3.18-helix-arm32v7
7777
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
78-
- (Alpine.314.Arm32)Ubuntu.1804[email protected]/dotnet-buildtools/prereqs:alpine-3.14-helix-arm32v7
78+
- (Alpine.318.Arm32)Ubuntu.2204[email protected]/dotnet-buildtools/prereqs:alpine-3.18-helix-arm32v7
7979

8080
# Linux musl arm64
8181
- ${{ if eq(parameters.platform, 'Linux_musl_arm64') }}:
8282
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
83-
- (Alpine.314.Arm64.Open)Ubuntu.1804[email protected]/dotnet-buildtools/prereqs:alpine-3.14-helix-arm64v8
83+
- (Alpine.318.Arm64.Open)Ubuntu.2204[email protected]/dotnet-buildtools/prereqs:alpine-3.18-helix-arm64v8
8484
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
85-
- (Alpine.314.Arm64)Ubuntu.1804[email protected]/dotnet-buildtools/prereqs:alpine-3.14-helix-arm64v8
85+
- (Alpine.318.Arm64)Ubuntu.2204[email protected]/dotnet-buildtools/prereqs:alpine-3.18-helix-arm64v8
8686

8787
# Linux x64
8888
- ${{ if eq(parameters.platform, 'Linux_x64') }}:
8989
- ${{ if and(eq(variables['System.TeamProject'], 'public'), in(parameters.jobParameters.helixQueueGroup, 'pr', 'ci', 'libraries')) }}:
90-
- Ubuntu.1804.Amd64.Open
90+
- Ubuntu.2004.Amd64.Open
9191
- ${{ if and(eq(variables['System.TeamProject'], 'public'), notIn(parameters.jobParameters.helixQueueGroup, 'pr', 'ci', 'libraries')) }}:
92-
- (Debian.10.Amd64.Open)Ubuntu.1804[email protected]/dotnet-buildtools/prereqs:debian-10-helix-amd64
93-
- (Debian.11.Amd64.Open)Ubuntu.1804[email protected]/dotnet-buildtools/prereqs:debian-11-helix-amd64
94-
- Ubuntu.1804.Amd64.Open
92+
- (Debian.12.Amd64.Open)Ubuntu.2204[email protected]/dotnet-buildtools/prereqs:debian-12-helix-amd64
93+
- (Debian.11.Amd64.Open)Ubuntu.2204[email protected]/dotnet-buildtools/prereqs:debian-11-helix-amd64
94+
- Ubuntu.2004.Amd64.Open
9595
- RedHat.7.Amd64.Open
9696
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
97-
- (Debian.10.Amd64)Ubuntu.1804[email protected]/dotnet-buildtools/prereqs:debian-10-helix-amd64
98-
- (Debian.11.Amd64)Ubuntu.1804[email protected]/dotnet-buildtools/prereqs:debian-11-helix-amd64
99-
- Ubuntu.1804.Amd64
100-
- (Fedora.34.Amd64)[email protected]/dotnet-buildtools/prereqs:fedora-34-helix
97+
- (Debian.12.Amd64)Ubuntu.2204[email protected]/dotnet-buildtools/prereqs:debian-12-helix-amd64
98+
- (Debian.11.Amd64)Ubuntu.2204[email protected]/dotnet-buildtools/prereqs:debian-11-helix-amd64
99+
- Ubuntu.2004.Amd64
100+
- (Fedora.39.Amd64)[email protected]/dotnet-buildtools/prereqs:fedora-39-helix
101101
- RedHat.7.Amd64
102102

103103
# OSX arm64

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

+20-21
Original file line numberDiff line numberDiff line change
@@ -29,56 +29,55 @@ jobs:
2929
# Linux arm
3030
- ${{ if eq(parameters.platform, 'Linux_arm') }}:
3131
- ${{ if eq(parameters.jobParameters.isFullMatrix, true) }}:
32-
- (Debian.10.Arm32.Open)Ubuntu.1804[email protected]/dotnet-buildtools/prereqs:debian-10-helix-arm32v7
33-
- (Debian.11.Arm32.Open)Ubuntu.1804[email protected]/dotnet-buildtools/prereqs:debian-11-helix-arm32v7
32+
- (Debian.12.Arm32.Open)Ubuntu.2204[email protected]/dotnet-buildtools/prereqs:debian-12-helix-arm32v7
33+
- (Debian.11.Arm32.Open)Ubuntu.2204[email protected]/dotnet-buildtools/prereqs:debian-11-helix-arm32v7
3434

3535
# Linux arm64
3636
- ${{ if eq(parameters.platform, 'Linux_arm64') }}:
3737
- ${{ if eq(parameters.jobParameters.isFullMatrix, true) }}:
38-
- (Ubuntu.1804.Arm64.Open)Ubuntu.1804[email protected]/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm64v8
38+
- (Ubuntu.204.Arm64.Open)Ubuntu.2204[email protected]/dotnet-buildtools/prereqs:ubuntu-20.04-helix-arm64v8
3939
- ${{ if eq(parameters.jobParameters.isFullMatrix, false) }}:
40-
- (Ubuntu.1804.Arm64.Open)Ubuntu.1804[email protected]/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm64v8
40+
- (Ubuntu.204.Arm64.Open)Ubuntu.2204[email protected]/dotnet-buildtools/prereqs:ubuntu-20.04-helix-arm64v8
4141

4242
# Linux musl x64
4343
- ${{ if eq(parameters.platform, 'Linux_musl_x64') }}:
44-
- (Alpine.314.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.14-helix-amd64
44+
- (Alpine.319.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.19-helix-amd64
4545
- ${{ if eq(parameters.jobParameters.isFullMatrix, true) }}:
46-
- (Alpine.313.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.13-helix-amd64
46+
- (Alpine.318.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.18-helix-amd64
4747

4848
# Linux musl arm64
4949
- ${{ if and(eq(parameters.platform, 'Linux_musl_arm64'), eq(parameters.jobParameters.isFullMatrix, true)) }}:
50-
- (Alpine.313.Arm64.Open)ubuntu.1804[email protected]/dotnet-buildtools/prereqs:alpine-3.13-helix-arm64v8
51-
- (Alpine.314.Arm64.Open)ubuntu.1804[email protected]/dotnet-buildtools/prereqs:alpine-3.14-helix-arm64v8
50+
- (Alpine.318.Arm64.Open)ubuntu.2204[email protected]/dotnet-buildtools/prereqs:alpine-3.18-helix-arm64v8
51+
- (Alpine.319.Arm64.Open)ubuntu.2204[email protected]/dotnet-buildtools/prereqs:alpine-3.19-helix-arm64v8
5252

5353
# Linux x64
5454
- ${{ if eq(parameters.platform, 'Linux_x64') }}:
5555
- ${{ if and(eq(parameters.jobParameters.interpreter, ''), ne(parameters.jobParameters.isSingleFile, true)) }}:
5656
- ${{ if and(eq(parameters.jobParameters.testScope, 'outerloop'), eq(parameters.jobParameters.runtimeFlavor, 'mono')) }}:
5757
- RedHat.7.Amd64.Open
5858
- SLES.15.Amd64.Open
59-
- (Fedora.34.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:fedora-34-helix
59+
- (Fedora.39.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:fedora-39-helix
6060
- ubuntu.2204.amd64.open.svc
61-
- (Debian.10.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:debian-10-helix-amd64
61+
- (Debian.11.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:debian-11-helix-amd64
6262
- ${{ if or(ne(parameters.jobParameters.testScope, 'outerloop'), ne(parameters.jobParameters.runtimeFlavor, 'mono')) }}:
6363
- ${{ if eq(parameters.jobParameters.isFullMatrix, true) }}:
6464
- (Centos.7.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:centos-7-mlnet-helix
6565
- RedHat.7.Amd64.Open
66-
- Ubuntu.1804.Amd64.Open
66+
- Ubuntu.2004.Amd64.Open
6767
- SLES.12.Amd64.Open
6868
- SLES.15.Amd64.Open
69-
- (Fedora.34.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:fedora-34-helix
69+
- (Fedora.39.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:fedora-39-helix
7070
- ubuntu.2204.amd64.open.svc
71-
- (Debian.10.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:debian-10-helix-amd64
72-
- (Debian.11.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:debian-11-helix-amd64
73-
- (Mariner.1.0.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:cbl-mariner-1.0-helix
71+
- (Debian.11.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:debian-11-helix-amd64
72+
- (Mariner.2.0.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:cbl-mariner-2.0-helix
7473
- ${{ if eq(parameters.jobParameters.isFullMatrix, false) }}:
75-
- (Centos.7.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:centos-7-mlnet-helix
74+
- (Centos.7.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:centos-stream9-helix
7675
- RedHat.7.Amd64.Open
77-
- (Debian.10.Amd64.Open)Ubuntu.1804[email protected]/dotnet-buildtools/prereqs:debian-10-helix-amd64
78-
- Ubuntu.1804.Amd64.Open
76+
- (Debian.11.Amd64.Open)Ubuntu.2204[email protected]/dotnet-buildtools/prereqs:debian-11-helix-amd64
77+
- Ubuntu.2004.Amd64.Open
7978
- ${{ if or(eq(parameters.jobParameters.interpreter, 'true'), eq(parameters.jobParameters.isSingleFile, true)) }}:
8079
# Limiting interp runs as we don't need as much coverage.
81-
- (Debian.10.Amd64.Open)Ubuntu.1804[email protected]/dotnet-buildtools/prereqs:debian-10-helix-amd64
80+
- (Debian.11.Amd64.Open)Ubuntu.2204[email protected]/dotnet-buildtools/prereqs:debian-11-helix-amd64
8281

8382
# Linux s390x
8483
- ${{ if eq(parameters.platform, 'Linux_s390x') }}:
@@ -94,7 +93,7 @@ jobs:
9493

9594
# Android
9695
- ${{ if in(parameters.platform, 'Android_x86', 'Android_x64') }}:
97-
- Ubuntu.1804.Amd64.Android.29.Open
96+
- Ubuntu.2204.Amd64.Android.29.Open
9897
- ${{ if in(parameters.platform, 'Android_arm', 'Android_arm64') }}:
9998
- Windows.10.Amd64.Android.Open
10099

@@ -175,7 +174,7 @@ jobs:
175174

176175
# WebAssembly
177176
- ${{ if eq(parameters.platform, 'Browser_wasm') }}:
178-
- Ubuntu.1804.Amd64.Open
177+
- Ubuntu.2204.Amd64.Open
179178

180179
# WebAssembly windows
181180
- ${{ if eq(parameters.platform, 'Browser_wasm_win') }}:

0 commit comments

Comments
 (0)