Skip to content

Commit 2c9aaaf

Browse files
richlanderrichlander
authored
Update helix images (dotnet#110384)
1 parent b5ea456 commit 2c9aaaf

File tree

2 files changed

+25
-26
lines changed

2 files changed

+25
-26
lines changed

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -63,37 +63,37 @@ jobs:
6363
# Linux arm
6464
- ${{ if eq(parameters.platform, 'linux_arm') }}:
6565
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
66-
- (Debian.12.Arm32.Open)Ubuntu.2004[email protected]/dotnet-buildtools/prereqs:debian-12-helix-arm32v7
66+
- (Debian.12.Arm32.Open)Ubuntu.2204[email protected]/dotnet-buildtools/prereqs:debian-12-helix-arm32v7
6767
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
68-
- (Debian.12.Arm32)Ubuntu.2004[email protected]/dotnet-buildtools/prereqs:debian-12-helix-arm32v7
68+
- (Debian.12.Arm32)Ubuntu.2204[email protected]/dotnet-buildtools/prereqs:debian-12-helix-arm32v7
6969

7070
# Linux arm64
7171
- ${{ if eq(parameters.platform, 'linux_arm64') }}:
7272
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
73-
- (Ubuntu.2004.Arm64.Open)Ubuntu.2004[email protected]/dotnet-buildtools/prereqs:ubuntu-20.04-helix-arm64v8
73+
- (Ubuntu.2004.Arm64.Open)Ubuntu.2204[email protected]/dotnet-buildtools/prereqs:ubuntu-20.04-helix-arm64v8
7474
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
75-
- (Ubuntu.2004.Arm64)Ubuntu.2004[email protected]/dotnet-buildtools/prereqs:ubuntu-20.04-helix-arm64v8
75+
- (Ubuntu.2004.Arm64)Ubuntu.2204[email protected]/dotnet-buildtools/prereqs:ubuntu-20.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.317.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.17-helix-amd64
80+
- (Alpine.320.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.20-helix-amd64
8181
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
82-
- (Alpine.317.Amd64)[email protected]/dotnet-buildtools/prereqs:alpine-3.17-helix-amd64
82+
- (Alpine.320.Amd64)[email protected]/dotnet-buildtools/prereqs:alpine-3.20-helix-amd64
8383

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

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

9898
# Linux x64
9999
- ${{ if eq(parameters.platform, 'linux_x64') }}:

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

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -26,57 +26,56 @@ jobs:
2626
# Linux arm
2727
- ${{ if eq(parameters.platform, 'linux_arm') }}:
2828
- ${{ if or(eq(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
29-
- (Debian.12.Arm32.Open)Ubuntu.2004[email protected]/dotnet-buildtools/prereqs:debian-12-helix-arm32v7
29+
- (Debian.12.Arm32.Open)Ubuntu.2204[email protected]/dotnet-buildtools/prereqs:debian-12-helix-arm32v7
3030

3131
# Linux armv6
3232
- ${{ if eq(parameters.platform, 'linux_armv6') }}:
33-
- (Raspbian.10.Armv6.Open)Ubuntu.2004[email protected]/dotnet-buildtools/prereqs:raspbian-10-helix-arm32v6
33+
- (Raspbian.10.Armv6.Open)Ubuntu.2204[email protected]/dotnet-buildtools/prereqs:raspbian-10-helix-arm32v6
3434

3535
# Linux arm64
3636
- ${{ if eq(parameters.platform, 'linux_arm64') }}:
37-
- (Ubuntu.2204.Arm64.Open)Ubuntu.2004[email protected]/dotnet-buildtools/prereqs:ubuntu-22.04-helix-arm64v8
37+
- (Ubuntu.2204.Arm64.Open)Ubuntu.2204[email protected]/dotnet-buildtools/prereqs:ubuntu-22.04-helix-arm64v8
3838
- ${{ if or(ne(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
39-
- (Debian.11.Arm64.Open)Ubuntu.2004[email protected]/dotnet-buildtools/prereqs:debian-11-helix-arm64v8
39+
- (Debian.12.Arm64.Open)Ubuntu.2204[email protected]/dotnet-buildtools/prereqs:debian-12-helix-arm64v8
4040

4141
# Linux musl x64
4242
- ${{ if eq(parameters.platform, 'linux_musl_x64') }}:
4343
- ${{ if or(ne(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
44-
- (Alpine.317.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.17-helix-amd64
44+
- (Alpine.320.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.20-helix-amd64
4545
- ${{ if or(eq(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
4646
- (Alpine.320.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.20-helix-amd64
4747
- (Alpine.318.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.18-helix-amd64
4848

4949
# Linux musl arm64
5050
- ${{ if and(eq(parameters.platform, 'linux_musl_arm64'), or(eq(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true))) }}:
51-
- (Alpine.320.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.20-helix-arm64v8
52-
- (Alpine.318.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.18-helix-arm64v8
53-
- (Alpine.317.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.17-helix-arm64v8
51+
- (Alpine.320.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.20-helix-arm64v8
52+
- (Alpine.318.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.18-helix-arm64v8
5453

5554
# Linux x64
5655
- ${{ if eq(parameters.platform, 'linux_x64') }}:
5756
- ${{ if and(eq(parameters.jobParameters.interpreter, ''), ne(parameters.jobParameters.isSingleFile, true)) }}:
5857
- ${{ if and(eq(parameters.jobParameters.testScope, 'outerloop'), eq(parameters.jobParameters.runtimeFlavor, 'mono')) }}:
5958
- SLES.15.Amd64.Open
60-
- (Centos.8.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:centos-stream8-helix
61-
- (Fedora.38.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:fedora-38-helix
59+
- (Centos.9.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:centos-stream9-helix
60+
- (Fedora.41.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:fedora-41-helix
6261
- (Ubuntu.2204.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:ubuntu-22.04-helix-amd64
63-
- (Debian.11.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:debian-11-helix-amd64
62+
- (Debian.12.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:debian-12-helix-amd64
6463
- ${{ if or(ne(parameters.jobParameters.testScope, 'outerloop'), ne(parameters.jobParameters.runtimeFlavor, 'mono')) }}:
6564
- ${{ if or(eq(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
6665
- SLES.15.Amd64.Open
67-
- (Fedora.38.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:fedora-38-helix
66+
- (Fedora.41.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:fedora-41-helix
6867
- Ubuntu.2204.Amd64.Open
69-
- (Debian.11.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:debian-11-helix-amd64
68+
- (Debian.12.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:debian-12-helix-amd64
7069
- (Mariner.2.0.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:cbl-mariner-2.0-helix-amd64
7170
- (AzureLinux.3.0.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:azurelinux-3.0-helix-amd64
7271
- (openSUSE.15.2.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:opensuse-15.2-helix-amd64
7372
- ${{ if or(ne(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
74-
- (Centos.8.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:centos-stream8-helix
75-
- (Debian.11.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:debian-11-helix-amd64
73+
- (Centos.9.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:centos-stream9-helix
74+
- (Debian.12.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:debian-12-helix-amd64
7675
- Ubuntu.2204.Amd64.Open
7776
- ${{ if or(eq(parameters.jobParameters.interpreter, 'true'), eq(parameters.jobParameters.isSingleFile, true)) }}:
7877
# Limiting interp runs as we don't need as much coverage.
79-
- (Debian.11.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:debian-11-helix-amd64
78+
- (Debian.12.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:debian-12-helix-amd64
8079

8180
# Linux s390x
8281
- ${{ if eq(parameters.platform, 'linux_s390x') }}:

0 commit comments

Comments
 (0)