Skip to content

Commit

Permalink
Update test OS matrix
Browse files Browse the repository at this point in the history
* Update all docker-based configurations to the latest tags
* Remove Alpine 3.8 (near EOL)
* Add Alpine 3.11
* Remove Fedora 28 (EOL)
* Add Fedora 30
* Add OSX 10.15 to fullMatrix runs
  • Loading branch information
bartonjs authored Jan 30, 2020
1 parent 2748ca5 commit 5b5aec6
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 28 deletions.
29 changes: 15 additions & 14 deletions eng/pipelines/coreclr/templates/helix-queues-setup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,36 +23,36 @@ 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-30f6673-20190814153226
- (Ubuntu.1804.Arm32.Open)[email protected]/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm32v7-bfcd90a-20200121150440
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- (Debian.9.Arm32)[email protected]/dotnet-buildtools/prereqs:debian-9-helix-arm32v7-74c9941-20190620155841
- (Ubuntu.1804.Arm32)[email protected]/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm32v7-30f6673-20190814153226
- (Debian.9.Arm32)[email protected]/dotnet-buildtools/prereqs:debian-9-helix-arm32v7-bfcd90a-20200121150037
- (Ubuntu.1804.Arm32)[email protected]/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm32v7-bfcd90a-20200121150440

# 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-a45aeeb-20190620155855
- ${{ if and(eq(variables['System.TeamProject'], 'public'), notIn(parameters.jobParameters.helixQueueGroup, 'pr', 'ci', 'libraries')) }}:
- (Debian.9.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:debian-9-helix-arm64v8-74c9941-20190620155840
- (Debian.9.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:debian-9-helix-arm64v8-bfcd90a-20200121150055
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- (Debian.9.Arm64)[email protected]/dotnet-buildtools/prereqs:debian-9-helix-arm64v8-74c9941-20190620155840
- (Debian.9.Arm64)[email protected]/dotnet-buildtools/prereqs:debian-9-helix-arm64v8-bfcd90a-20200121150055
- (Ubuntu.1804.Arm64)[email protected]/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm64v8-a45aeeb-20190620155855

# Linux musl x64
- ${{ if eq(parameters.platform, 'Linux_musl_x64') }}:
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
- (Alpine.310.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.10-helix-3043688-20190918214010
- (Alpine.311.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.11-helix-bfcd90a-20200123191053
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- (Alpine.38.Amd64)[email protected]/dotnet-buildtools/prereqs:alpine-3.8-helix-09ca40b-20190508143246
- (Alpine.39.Amd64)[email protected]/dotnet-buildtools/prereqs:alpine-3.9-helix-09ca40b-20190508143246
- (Alpine.310.Amd64)[email protected]/dotnet-buildtools/prereqs:alpine-3.10-helix-3043688-20190918214010
- (Alpine.39.Amd64)[email protected]/dotnet-buildtools/prereqs:alpine-3.9-helix-bfcd90a-20200123191053
- (Alpine.310.Amd64)[email protected]/dotnet-buildtools/prereqs:alpine-3.10-helix-bfcd90a-20200123191054
- (Alpine.311.Amd64)[email protected]/dotnet-buildtools/prereqs:alpine-3.11-helix-bfcd90a-20200123191053

# Linux musl arm64
- ${{ if eq(parameters.platform, 'Linux_musl_arm64') }}:
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
- (Alpine.38.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.8-helix-arm64v8-a45aeeb-20190620184035
- (Alpine.311.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.11-helix-arm64v8-bfcd90a-20200123191027
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- (Alpine.38.Arm64)[email protected]/dotnet-buildtools/prereqs:alpine-3.8-helix-arm64v8-a45aeeb-20190620184035
- (Alpine.311.Arm64)[email protected]/dotnet-buildtools/prereqs:alpine-3.11-helix-arm64v8-bfcd90a-20200123191027

# Linux x64
- ${{ if eq(parameters.platform, 'Linux_x64') }}:
Expand All @@ -69,7 +69,7 @@ jobs:
- Ubuntu.1604.Amd64
- Ubuntu.1804.Amd64
- Centos.7.Amd64
- (Fedora.28.Amd64)[email protected]/dotnet-buildtools/prereqs:fedora-28-helix-09ca40b-20190508143249
- (Fedora.30.Amd64)[email protected]/dotnet-buildtools/prereqs:fedora-30-helix-4f8cef7-20200121150022
- RedHat.7.Amd64

# OSX x64
Expand All @@ -82,13 +82,14 @@ jobs:
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- OSX.1013.Amd64
- OSX.1014.Amd64
- OSX.1015.Amd64

# Windows_NT x64
- ${{ if eq(parameters.platform, 'Windows_NT_x64') }}:
- ${{ if and(eq(variables['System.TeamProject'], 'public'), in(parameters.jobParameters.helixQueueGroup, 'pr', 'ci', 'libraries')) }}:
- Windows.10.Amd64.Open
- ${{ if and(eq(variables['System.TeamProject'], 'public'), notIn(parameters.jobParameters.helixQueueGroup, 'pr', 'ci', 'libraries')) }}:
- (Windows.Nano.1809.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:nanoserver-1809-helix-amd64-61052b7-20190723211353
- (Windows.Nano.1809.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:nanoserver-1809-helix-amd64-08e8e40-20200107182504
- Windows.7.Amd64.Open
- Windows.81.Amd64.Open
- Windows.10.Amd64.Open
Expand All @@ -97,7 +98,7 @@ jobs:
- Windows.81.Amd64
- Windows.10.Amd64
- Windows.10.Amd64.Core
- (Windows.Nano.1809.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:nanoserver-1809-helix-amd64-61052b7-20190723211353
- (Windows.Nano.1809.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:nanoserver-1809-helix-amd64-08e8e40-20200107182504

# Windows_NT x86
- ${{ if eq(parameters.platform, 'Windows_NT_x86') }}:
Expand Down
33 changes: 19 additions & 14 deletions eng/pipelines/libraries/helix-queues-setup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,22 +23,21 @@ jobs:
# Linux arm
- ${{ if eq(parameters.platform, 'Linux_arm') }}:
- ${{ if eq(parameters.jobParameters.isFullMatrix, true) }}:
- (Debian.9.Arm32.Open)[email protected]/dotnet-buildtools/prereqs:debian-9-helix-arm32v7-74c9941-20190620155841
- (Debian.9.Arm32.Open)[email protected]/dotnet-buildtools/prereqs:debian-9-helix-arm32v7-bfcd90a-20200121150037

# Linux arm64
- ${{ if eq(parameters.platform, 'Linux_arm64') }}:
- ${{ if eq(parameters.jobParameters.isFullMatrix, true) }}:
- (Ubuntu.1804.ArmArch.Open)[email protected]/dotnet-buildtools/prereqs:ubuntu-16.04-helix-arm64v8-a45aeeb-20190620160300
- (Ubuntu.1804.ArmArch.Open)[email protected]/dotnet-buildtools/prereqs:ubuntu-16.04-helix-arm64v8-bfcd90a-20200127194925

# Linux musl x64
- ${{ if eq(parameters.platform, 'Linux_musl_x64') }}:
- ${{ if eq(parameters.jobParameters.isFullMatrix, false) }}:
- (Alpine.311.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.11-helix-08e8e40-20200107182408
- (Alpine.311.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.11-helix-bfcd90a-20200123191053
- ${{ if eq(parameters.jobParameters.isFullMatrix, true) }}:
- (Alpine.38.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.8-helix-09ca40b-20190620184125
- (Alpine.39.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.9-helix-09ca40b-20190620184719
- (Alpine.310.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.10-helix-3043688-20190918214010
- (Alpine.311.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.11-helix-08e8e40-20200107182408
- (Alpine.39.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.9-helix-bfcd90a-20200123191053
- (Alpine.310.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.10-helix-bfcd90a-20200123191054
- (Alpine.311.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.11-helix-bfcd90a-20200123191053

# Issue tracking this being re-enabled https://github.com/dotnet/runtime/issues/1723
# Linux musl arm64
Expand All @@ -56,22 +55,28 @@ jobs:
- Ubuntu.1804.Amd64.Open
- SLES.12.Amd64.Open
- SLES.15.Amd64.Open
- (Fedora.29.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:fedora-29-helix-09ca40b-20190508143249
- (Fedora.29.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:fedora-29-helix-a12566d-20191210224553
- (Fedora.30.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:fedora-30-helix-4f8cef7-20200121150022
- (Ubuntu.1910.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:ubuntu-19.10-helix-amd64-cfcfd50-20191030180623
- (Debian.10.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:debian-10-helix-amd64-7c6abd3-20190620155928
- (Debian.10.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:debian-10-helix-amd64-bfcd90a-20200121150006
- ${{ if eq(parameters.jobParameters.isFullMatrix, false) }}:
- Centos.7.Amd64.Open
- RedHat.7.Amd64.Open
- Debian.9.Amd64.Open
- Ubuntu.1604.Amd64.Open
- Ubuntu.1804.Amd64.Open
- SLES.15.Amd64.Open
- (Fedora.29.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:fedora-29-helix-09ca40b-20190508143249
- (Fedora.29.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:fedora-29-helix-a12566d-20191210224553

# OSX x64
- ${{ if eq(parameters.platform, 'OSX_x64') }}:
- OSX.1013.Amd64.Open
- OSX.1014.Amd64.Open
- ${{ if eq(parameters.jobParameters.isFullMatrix, true) }}:
- OSX.1013.Amd64.Open
- OSX.1014.Amd64.Open
- OSX.1015.Amd64.Open
- ${{ if eq(parameters.jobParameters.isFullMatrix, false) }}:
- OSX.1013.Amd64.Open
- OSX.1014.Amd64.Open

# Windows_NT x64
- ${{ if eq(parameters.platform, 'Windows_NT_x64') }}:
Expand All @@ -82,12 +87,12 @@ jobs:
- Windows.81.Amd64.Open
- Windows.10.Amd64.ServerRS5.Open
- Windows.10.Amd64.Server19H1.Open
- (Windows.Nano.1809.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:nanoserver-1809-helix-amd64-61052b7-20190723211353
- (Windows.Nano.1809.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:nanoserver-1809-helix-amd64-08e8e40-20200107182504
- ${{ if eq(parameters.jobParameters.isFullMatrix, false) }}:
- Windows.7.Amd64.Open
- Windows.81.Amd64.Open
- Windows.10.Amd64.Server19H1.ES.Open
- (Windows.Nano.1809.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:nanoserver-1809-helix-amd64-61052b7-20190723211353
- (Windows.Nano.1809.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:nanoserver-1809-helix-amd64-08e8e40-20200107182504

# NET472
- ${{ if eq(parameters.jobParameters.framework, 'net472') }}:
Expand Down

0 comments on commit 5b5aec6

Please sign in to comment.