Skip to content

Commit

Permalink
Update-eol-versions-6.0-staging (#103380)
Browse files Browse the repository at this point in the history 
* Update EOL versions

* Update versions
  • Loading branch information
@richlander
richlander committed Jul 16, 2024
1 parent b23dd72 commit ff43d78
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 46 deletions.
52 changes: 26 additions & 26 deletions eng/pipelines/coreclr/templates/helix-queues-setup.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,68 +36,68 @@ jobs:

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

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

# Linux arm
- ${{ if eq(parameters.platform, 'Linux_arm') }}:
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
- (Ubuntu.1804.Arm32.Open)Ubuntu.1804[email protected]/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm32v7
- (Ubuntu.1804.Arm32.Open)Ubuntu.2204[email protected]/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm32v7
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- (Debian.10.Arm32)Ubuntu.1804[email protected]/dotnet-buildtools/prereqs:debian-10-helix-arm32v7
- (Debian.11.Arm32)Ubuntu.1804[email protected]/dotnet-buildtools/prereqs:debian-11-helix-arm32v7
- (Ubuntu.1804.Arm32)[email protected]/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm32v7
- (Debian.12.Arm32)Ubuntu.2204[email protected]/dotnet-buildtools/prereqs:debian-12-helix-arm32v7
- (Debian.11.Arm32)Ubuntu.2204[email protected]/dotnet-buildtools/prereqs:debian-11-helix-arm32v7
- (Ubuntu.2004.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)Ubuntu.1804[email protected]/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm64v8
- (Ubuntu.1804.Arm64.Open)Ubuntu.2204[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)Ubuntu.1804[email protected]/dotnet-buildtools/prereqs:debian-10-helix-arm64v8
- (Debian.11.Arm64.Open)Ubuntu.1804[email protected]/dotnet-buildtools/prereqs:debian-11-helix-arm64v8
- (Debian.12.Arm64.Open)Ubuntu.2204[email protected]/dotnet-buildtools/prereqs:debian-12-helix-arm64v8
- (Debian.11.Arm64.Open)Ubuntu.2204[email protected]/dotnet-buildtools/prereqs:debian-11-helix-arm64v8
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- (Debian.10.Arm64)Ubuntu.1804[email protected]/dotnet-buildtools/prereqs:debian-10-helix-arm64v8
- (Debian.11.Arm64)Ubuntu.1804[email protected]/dotnet-buildtools/prereqs:debian-11-helix-arm64v8
- (Ubuntu.1804.Arm64)Ubuntu.1804[email protected]/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm64v8
- (Debian.12.Arm64)Ubuntu.2204[email protected]/dotnet-buildtools/prereqs:debian-12-helix-arm64v8
- (Debian.11.Arm64)Ubuntu.2204[email protected]/dotnet-buildtools/prereqs:debian-11-helix-arm64v8
- (Ubuntu.1804.Arm64)Ubuntu.2204[email protected]/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm64v8

# Linux musl x64
- ${{ if eq(parameters.platform, 'linux_musl_x64') }}:
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
- (Alpine.317.Amd64.Open)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.17-helix-amd64
- (Alpine.318.Amd64.Open)ubuntu.2204.amd64.open.svc@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.18-helix-amd64
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- (Alpine.319.Amd64)Ubuntu.2204.Amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-helix-amd64
- (Alpine.318.Amd64)ubuntu.2204.amd64.svc@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.18-helix-amd64

# Linux musl arm32
- ${{ if eq(parameters.platform, 'linux_musl_arm') }}:
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
- (Alpine.317.Arm32.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.17-helix-arm32v7
- (Alpine.318.Arm32.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.18-helix-arm32v7
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- (Alpine.319.Arm32)[email protected]/dotnet-buildtools/prereqs:alpine-3.19-helix-arm32v7
- (Alpine.318.Arm32)[email protected]/dotnet-buildtools/prereqs:alpine-3.18-helix-arm32v7

# Linux musl arm64
- ${{ if eq(parameters.platform, 'linux_musl_arm64') }}:
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
- (Alpine.317.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.17-helix-arm64v8
- (Alpine.318.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.18-helix-arm64v8
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- (Alpine.319.Arm64)[email protected]/dotnet-buildtools/prereqs:alpine-3.19-helix-arm64v8
- (Alpine.318.Arm64)[email protected]/dotnet-buildtools/prereqs:alpine-3.18-helix-arm64v8

# Linux x64
- ${{ if eq(parameters.platform, 'Linux_x64') }}:
- ${{ if and(eq(variables['System.TeamProject'], 'public'), in(parameters.jobParameters.helixQueueGroup, 'pr', 'ci', 'libraries')) }}:
- Ubuntu.1804.Amd64.Open
- Ubuntu.2004.Amd64.Open
- ${{ if and(eq(variables['System.TeamProject'], 'public'), notIn(parameters.jobParameters.helixQueueGroup, 'pr', 'ci', 'libraries')) }}:
- (Debian.10.Amd64.Open)Ubuntu.1804[email protected]/dotnet-buildtools/prereqs:debian-10-helix-amd64
- (Debian.11.Amd64.Open)Ubuntu.1804[email protected]/dotnet-buildtools/prereqs:debian-11-helix-amd64
- Ubuntu.1804.Amd64.Open
- (Debian.12.Amd64.Open)Ubuntu.2204[email protected]/dotnet-buildtools/prereqs:debian-12-helix-amd64
- (Debian.11.Amd64.Open)Ubuntu.2204[email protected]/dotnet-buildtools/prereqs:debian-11-helix-amd64
- Ubuntu.2004.Amd64.Open
- RedHat.7.Amd64.Open
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- (Debian.10.Amd64)Ubuntu.1804[email protected]/dotnet-buildtools/prereqs:debian-10-helix-amd64
- (Debian.11.Amd64)Ubuntu.1804[email protected]/dotnet-buildtools/prereqs:debian-11-helix-amd64
- Ubuntu.1804.Amd64
- (Fedora.34.Amd64)[email protected]/dotnet-buildtools/prereqs:fedora-34-helix
- (Debian.12.Amd64)Ubuntu.2204[email protected]/dotnet-buildtools/prereqs:debian-12-helix-amd64
- (Debian.11.Amd64)Ubuntu.2204[email protected]/dotnet-buildtools/prereqs:debian-11-helix-amd64
- Ubuntu.2004.Amd64
- (Fedora.39.Amd64)[email protected]/dotnet-buildtools/prereqs:fedora-39-helix
- RedHat.7.Amd64

# OSX arm64
Expand Down
39 changes: 19 additions & 20 deletions eng/pipelines/libraries/helix-queues-setup.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,25 +29,25 @@ jobs:
# Linux arm
- ${{ if eq(parameters.platform, 'Linux_arm') }}:
- ${{ if eq(parameters.jobParameters.isFullMatrix, true) }}:
- (Debian.10.Arm32.Open)Ubuntu.1804[email protected]/dotnet-buildtools/prereqs:debian-10-helix-arm32v7
- (Debian.11.Arm32.Open)Ubuntu.1804[email protected]/dotnet-buildtools/prereqs:debian-11-helix-arm32v7
- (Debian.12.Arm32.Open)Ubuntu.2204[email protected]/dotnet-buildtools/prereqs:debian-12-helix-arm32v7
- (Debian.11.Arm32.Open)Ubuntu.2204[email protected]/dotnet-buildtools/prereqs:debian-11-helix-arm32v7

# Linux arm64
- ${{ if eq(parameters.platform, 'Linux_arm64') }}:
- ${{ if eq(parameters.jobParameters.isFullMatrix, true) }}:
- (Ubuntu.1804.Arm64.Open)Ubuntu.1804[email protected]/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm64v8
- (Ubuntu.1804.Arm64.Open)Ubuntu.2204[email protected]/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm64v8
- ${{ if eq(parameters.jobParameters.isFullMatrix, false) }}:
- (Ubuntu.1804.Arm64.Open)Ubuntu.1804[email protected]/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm64v8
- (Ubuntu.1804.Arm64.Open)Ubuntu.2204[email protected]/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm64v8

# Linux musl x64
- ${{ if eq(parameters.platform, 'Linux_musl_x64') }}:
- (Alpine.316.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.17-helix-amd64
- (Alpine.318.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.18-helix-amd64
- ${{ if eq(parameters.jobParameters.isFullMatrix, true) }}:
- (Alpine.319.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.19-helix-amd64
- (Alpine.318.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.18-helix-amd64

# Linux musl arm64
- ${{ if and(eq(parameters.platform, 'Linux_musl_arm64'), eq(parameters.jobParameters.isFullMatrix, true)) }}:
- (Alpine.316.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.17-helix-arm64v8
- (Alpine.318.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.18-helix-arm64v8
- (Alpine.319.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.19-helix-arm64v8

# Linux x64
Expand All @@ -56,29 +56,28 @@ jobs:
- ${{ if and(eq(parameters.jobParameters.testScope, 'outerloop'), eq(parameters.jobParameters.runtimeFlavor, 'mono')) }}:
- RedHat.7.Amd64.Open
- SLES.15.Amd64.Open
- (Fedora.34.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:fedora-34-helix
- (Fedora.39.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:fedora-39-helix
- ubuntu.2204.amd64.open.svc
- (Debian.10.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:debian-10-helix-amd64
- (Debian.11.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:debian-11-helix-amd64
- ${{ if or(ne(parameters.jobParameters.testScope, 'outerloop'), ne(parameters.jobParameters.runtimeFlavor, 'mono')) }}:
- ${{ if eq(parameters.jobParameters.isFullMatrix, true) }}:
- (Centos.7.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:centos-7-mlnet-helix
- RedHat.7.Amd64.Open
- Ubuntu.1804.Amd64.Open
- Ubuntu.2004.Amd64.Open
- SLES.12.Amd64.Open
- SLES.15.Amd64.Open
- (Fedora.34.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:fedora-34-helix
- (Fedora.39.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:fedora-39-helix
- ubuntu.2204.amd64.open.svc
- (Debian.10.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:debian-10-helix-amd64
- (Debian.11.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:debian-11-helix-amd64
- (Mariner.1.0.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:cbl-mariner-1.0-helix
- (Debian.11.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:debian-11-helix-amd64
- (Mariner.2.0.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:cbl-mariner-2.0-helix
- ${{ if eq(parameters.jobParameters.isFullMatrix, false) }}:
- (Centos.7.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:centos-7-mlnet-helix
- (Centos.7.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:centos-stream9-helix
- RedHat.7.Amd64.Open
- (Debian.10.Amd64.Open)Ubuntu.1804[email protected]/dotnet-buildtools/prereqs:debian-10-helix-amd64
- Ubuntu.1804.Amd64.Open
- (Debian.11.Amd64.Open)Ubuntu.2204[email protected]/dotnet-buildtools/prereqs:debian-11-helix-amd64
- Ubuntu.2004.Amd64.Open
- ${{ if or(eq(parameters.jobParameters.interpreter, 'true'), eq(parameters.jobParameters.isSingleFile, true)) }}:
# Limiting interp runs as we don't need as much coverage.
- (Debian.10.Amd64.Open)Ubuntu.1804[email protected]/dotnet-buildtools/prereqs:debian-10-helix-amd64
- (Debian.11.Amd64.Open)Ubuntu.2204[email protected]/dotnet-buildtools/prereqs:debian-11-helix-amd64

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

# Android
- ${{ if in(parameters.platform, 'Android_x86', 'Android_x64') }}:
- Ubuntu.1804.Amd64.Android.29.Open
- Ubuntu.2204.Amd64.Android.29.Open
- ${{ if in(parameters.platform, 'Android_arm', 'Android_arm64') }}:
- Windows.10.Amd64.Android.Open

Expand Down Expand Up @@ -172,7 +171,7 @@ jobs:

# WebAssembly
- ${{ if eq(parameters.platform, 'Browser_wasm') }}:
- Ubuntu.1804.Amd64.Open
- Ubuntu.2204.Amd64.Open

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

0 comments on commit ff43d78

Please sign in to comment.