Skip to content

Commit 3ed9592

Browse files
dougbudougbu
committed
Clean out Ubuntu 16.04 testing
- use Ubuntu 18.04 agents for testing in Docker containers on Helix nit: clean up a few old mentions of Centos and Fedora testing
1 parent e68043b commit 3ed9592

File tree

7 files changed

+22
-16
lines changed

7 files changed

+22
-16
lines changed

‎.azure/pipelines/jobs/default-build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,10 @@ jobs:
105105
${{ if eq(parameters.useHostedUbuntu, false) }}:
106106
${{ if eq(variables['System.TeamProject'], 'public') }}:
107107
name: NetCorePublic-Pool
108-
queue: BuildPool.Ubuntu.1604.Amd64.Open
108+
queue: BuildPool.Ubuntu.1804.Amd64.Open
109109
${{ if eq(variables['System.TeamProject'], 'internal') }}:
110110
name: NetCoreInternal-Pool
111-
queue: BuildPool.Ubuntu.1604.Amd64
111+
queue: BuildPool.Ubuntu.1804.Amd64
112112
${{ if eq(parameters.agentOs, 'Windows') }}:
113113
${{ if eq(variables['System.TeamProject'], 'public') }}:
114114
name: NetCorePublic-Pool

‎.azure/pipelines/quarantined-pr.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ jobs:
149149
- template: jobs/default-build.yml
150150
parameters:
151151
jobName: Linux_Quarantined_Test
152-
jobDisplayName: "Tests: Ubuntu 16.04 x64"
152+
jobDisplayName: "Tests: Ubuntu 18.04 x64"
153153
agentOs: Linux
154154
timeoutInMinutes: 60
155155
isTestingJob: true

‎docs/Helix.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ This will restore, and then publish all the test project including some bootstra
1818

1919
## Overview of the helix usage in our pipelines
2020

21-
- Required queues: Windows10, OSX, Ubuntu1604
22-
- Full queue matrix: Windows[7, 81, 10], Ubuntu[1604, 1804, 2004], Centos7, Debian9, Redhat7, Fedora28, Arm64 (Win10, Debian9)
21+
- Required queues: Windows10, OSX, Ubuntu1804
22+
- Full queue matrix: Windows[7, 81, 10], Ubuntu[1804, 2004], Debian9, Redhat7, Arm64 (Win10, Debian9)
2323
- The queues are defined in [Helix.Common.props](https://github.com/dotnet/aspnetcore/blob/main/eng/targets/Helix.Common.props)
2424

2525
[aspnetcore-ci](https://dev.azure.com/dnceng/public/_build?definitionId=278) runs non quarantined tests against the required helix queues as a required PR check and all builds on all branches.

‎eng/scripts/RunHelix.ps1‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,12 @@
88
.PARAMETER HelixQueues
99
Set the Helix queues to use. The list is '+' or ';'-separated.
1010
Some supported queues:
11-
Ubuntu.1604.Amd64.Open
1211
Ubuntu.1804.Amd64.Open
13-
Windows.10.Amd64.Open
12+
Ubuntu.2004.Amd64.Open
13+
Windows.10.Amd64.Server20H2.Open
1414
Windows.81.Amd64.Open
1515
Windows.7.Amd64.Open
1616
OSX.1014.Amd64.Open
17-
Centos.7.Amd64.Open
1817
Debian.9.Amd64.Open
1918
Redhat.7.Amd64.Open
2019
.PARAMETER RunQuarantinedTests
@@ -29,7 +28,7 @@ param(
2928
[Parameter(Mandatory=$true)]
3029
[string]$Project,
3130

32-
[string]$HelixQueues = "Windows.10.Amd64.Open",
31+
[string]$HelixQueues = "Windows.10.Amd64.Server20H2.Open",
3332
[switch]$RunQuarantinedTests,
3433

3534
[ValidateSet('x64', 'x86', 'arm', 'arm64')]

‎eng/targets/Helix.Common.props‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,12 @@
1919

2020
<!-- queues for helix-matrix.yml pipeline -->
2121
<ItemGroup Condition="'$(TargetArchitecture)' == 'x64' AND '$(IsHelixDaily)' == 'true' AND '$(_UseHelixOpenQueues)' == 'true' AND '$(IsWindowsOnlyTest)' != 'true'">
22-
<HelixAvailableTargetQueue Include="Ubuntu.1604.Amd64.Open" Platform="Linux" />
2322
<HelixAvailableTargetQueue Include="Ubuntu.2004.Amd64.Open" Platform="Linux" />
2423
<HelixAvailableTargetQueue Include="OSX.1100.Amd64.Open" Platform="Linux" />
2524
<HelixAvailableTargetQueue Include="Debian.9.Amd64.Open" Platform="Linux" />
2625
<HelixAvailableTargetQueue Include="Redhat.7.Amd64.Open" Platform="Linux" />
27-
<HelixAvailableTargetQueue Include="(Fedora.33.Amd64.Open)Ubuntu.1604.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-helix-20210120000908-a9df267" Platform="Linux" />
28-
<HelixAvailableTargetQueue Include="(Alpine.312.Amd64.Open)Ubuntu.1604.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.12-helix-20200908125345-56c6673" Platform="Linux" />
26+
<HelixAvailableTargetQueue Include="(Fedora.33.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-helix-20210120000908-a9df267" Platform="Linux" />
27+
<HelixAvailableTargetQueue Include="(Alpine.312.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.12-helix-20200908125345-56c6673" Platform="Linux" />
2928
</ItemGroup>
3029
<ItemGroup Condition="'$(TargetArchitecture)' == 'x64' AND '$(IsHelixDaily)' == 'true' AND '$(_UseHelixOpenQueues)' == 'true'">
3130
<!-- TODO Re-enable Win-7 queue when dotnet restore are fixed. https://github.com/dotnet/aspnetcore/issues/32683 -->

‎eng/targets/Helix.targets‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,18 @@
99
</ItemGroup>
1010

1111
<PropertyGroup Condition="'$(TestDependsOnPlaywright)' == 'true'">
12-
<SkipHelixQueues>Windows.7.Amd64.Open;Windows.81.Amd64.Open;Redhat.7.Amd64.Open;Redhat.7.Amd64;Debian.9.Amd64.Open;Debian.9.Amd64.Open;Ubuntu.2004.Amd64.Open;Ubuntu.2004.Amd64;Ubuntu.1604.Amd64.Open;Ubuntu.1604.Amd64;Alpine.312.Amd64.Open;(Alpine.312.Amd64.Open)Ubuntu.1604.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.12-helix-20200908125345-56c6673;(Fedora.33.Amd64.Open)Ubuntu.1604.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-helix-20210120000908-a9df267</SkipHelixQueues>
12+
<SkipHelixQueues>
13+
Windows.7.Amd64.Open;
14+
Windows.81.Amd64.Open;
15+
Redhat.7.Amd64.Open;
16+
Redhat.7.Amd64;
17+
Debian.9.Amd64.Open;
18+
Debian.9.Amd64;
19+
Ubuntu.2004.Amd64.Open;
20+
Ubuntu.2004.Amd64;
21+
(Alpine.312.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.12-helix-20200908125345-56c6673;
22+
(Fedora.33.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-helix-20210120000908-a9df267
23+
</SkipHelixQueues>
1324
<SkipHelixArm>true</SkipHelixArm>
1425
</PropertyGroup>
1526

‎src/Identity/test/Identity.Test/IdentityUIScriptsTest.cs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,6 @@ public static IEnumerable<object[]> ScriptWithFallbackSrcData
7979

8080
[Theory]
8181
[MemberData(nameof(ScriptWithFallbackSrcData))]
82-
// Ubuntu 16 uses an old version of OpenSSL that doesn't work well when an intermediate CA is expired.
83-
// We've decided to not run these tests against that OS anymore and will run on newer versions of Ubuntu.
84-
[SkipOnHelix("Skip on Ubuntu 16", Queues = "Ubuntu.1604.Amd64.Open;Ubuntu.1604.Amd64")]
8582
public async Task IdentityUI_ScriptTags_FallbackSourceContent_Matches_CDNContent(ScriptTag scriptTag)
8683
{
8784
var wwwrootDir = Path.Combine(GetProjectBasePath(), "wwwroot", scriptTag.Version);

0 commit comments

Comments
 (0)