Skip to content

Commit 20cf428

Browse files
dougbudougbu
committed
[release/5.0] Clean out Ubuntu 16.04 testing
- backport of #32894 - !temporary! intentionally leave merge conflict indicators * Clean out Ubuntu 16.04 testing - use Ubuntu 18.04 agents for testing in Docker containers on Helix nits: - clean up a few old mentions of Centos and Fedora testing - fix `%(Platform)` metadata for OSX `@(HelixAvailableTargetQueue)` items - don't mention unused internal queues in `$(TestDependsOnPlaywright)` update of `$(SkipHelixQueues)` - sort remaining queues alphabetically in `$(SkipHelixQueues)`
1 parent 028ea74 commit 20cf428

File tree

7 files changed

+74
-9
lines changed

7 files changed

+74
-9
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,10 @@ jobs:
9999
${{ if eq(parameters.useHostedUbuntu, false) }}:
100100
${{ if eq(variables['System.TeamProject'], 'public') }}:
101101
name: NetCorePublic-Pool
102-
queue: BuildPool.Ubuntu.1604.Amd64.Open
102+
queue: BuildPool.Ubuntu.1804.Amd64.Open
103103
${{ if eq(variables['System.TeamProject'], 'internal') }}:
104104
name: NetCoreInternal-Pool
105-
queue: BuildPool.Ubuntu.1604.Amd64
105+
queue: BuildPool.Ubuntu.1804.Amd64
106106
${{ if eq(parameters.agentOs, 'Windows') }}:
107107
${{ if eq(variables['System.TeamProject'], 'public') }}:
108108
name: NetCorePublic-Pool

‎.azure/pipelines/quarantined-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ jobs:
128128
- template: jobs/default-build.yml
129129
parameters:
130130
jobName: Linux_Quarantined_Test
131-
jobDisplayName: "Tests: Ubuntu 16.04 x64"
131+
jobDisplayName: "Tests: Ubuntu 18.04 x64"
132132
agentOs: Linux
133133
timeoutInMinutes: 60
134134
isTestingJob: true

‎docs/Helix.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,15 @@ 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+
<<<<<<< HEAD
2122
- Required queues: Windows10, OSX, Ubuntu1604
2223
- Full queue matrix: Windows[7, 81, 10], Ubuntu[1604, 1804, 2004], Centos7, Debian9, Redhat7, Fedora28, Arm64 (Win10, Debian9)
2324
- The queues are defined in [Helix.Common.props](https://github.com/dotnet/aspnetcore/blob/master/eng/targets/Helix.Common.props)
25+
=======
26+
- Required queues: Windows10, OSX, Ubuntu1804
27+
- Full queue matrix: Windows[7, 81, 10], Ubuntu[1804, 2004], Debian9, Redhat7, Arm64 (Win10, Debian9)
28+
- The queues are defined in [Helix.Common.props](https://github.com/dotnet/aspnetcore/blob/main/eng/targets/Helix.Common.props)
29+
>>>>>>> 83f7970b8c... Clean out Ubuntu 16.04 testing (#32894)
2430
2531
[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.
2632

‎eng/scripts/RunHelix.ps1

Lines changed: 10 additions & 3 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
@@ -23,7 +22,15 @@
2322
param(
2423
[Parameter(Mandatory=$true)]
2524
[string]$Project,
25+
<<<<<<< HEAD
2626
[string]$HelixQueues = "Windows.10.Amd64.Open",
27+
=======
28+
29+
[string]$HelixQueues = "Windows.10.Amd64.Server20H2.Open",
30+
[switch]$RunQuarantinedTests,
31+
32+
[ValidateSet('x64', 'x86', 'arm', 'arm64')]
33+
>>>>>>> 83f7970b8c... Clean out Ubuntu 16.04 testing (#32894)
2734
[string]$TargetArchitecture = "x64",
2835
[bool]$RunQuarantinedTests = $false
2936
)

‎eng/targets/Helix.Common.props

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
</ItemGroup>
2020

2121
<!-- PR(ci.yaml) required queues -->
22+
<<<<<<< HEAD
2223
<ItemGroup Condition="'$(IsRequiredCheck)' == 'true' AND '$(TargetArchitecture)' == 'x64'">
2324
<HelixAvailableTargetQueue Include="Ubuntu.1604.Amd64.Open" Platform="Linux" />
2425
<HelixAvailableTargetQueue Include="Windows.10.Amd64.Open" Platform="Windows" />
@@ -35,6 +36,30 @@
3536
<HelixAvailableTargetQueue Include="Debian.9.Amd64.Open" Platform="Linux" />
3637
<HelixAvailableTargetQueue Include="Redhat.7.Amd64.Open" Platform="Linux" />
3738
<HelixAvailableTargetQueue Include="(Fedora.28.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:fedora-28-helix-09ca40b-20190508143249" Platform="Linux" />
39+
=======
40+
<ItemGroup Condition="'$(IsRequiredCheck)' == 'true' AND '$(TargetArchitecture)' == 'x64' AND '$(_UseHelixOpenQueues)' == 'true'">
41+
<HelixAvailableTargetQueue Include="Ubuntu.1804.Amd64.Open" Platform="Linux" />
42+
<HelixAvailableTargetQueue Include="Windows.10.Amd64.Server20H2.Open" Platform="Windows" />
43+
<HelixAvailableTargetQueue Include="OSX.1014.Amd64.Open" Platform="OSX" />
44+
</ItemGroup>
45+
46+
<!-- queues for helix-matrix.yml pipeline -->
47+
<ItemGroup Condition="'$(TargetArchitecture)' == 'x64' AND '$(IsHelixDaily)' == 'true' AND '$(_UseHelixOpenQueues)' == 'true' AND '$(IsWindowsOnlyTest)' != 'true'">
48+
<HelixAvailableTargetQueue Include="Ubuntu.2004.Amd64.Open" Platform="Linux" />
49+
<HelixAvailableTargetQueue Include="OSX.1100.Amd64.Open" Platform="OSX" />
50+
<HelixAvailableTargetQueue Include="Debian.9.Amd64.Open" Platform="Linux" />
51+
<HelixAvailableTargetQueue Include="Redhat.7.Amd64.Open" Platform="Linux" />
52+
<HelixAvailableTargetQueue Include="(Fedora.33.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:fedora-33-helix-20210120000908-a9df267" Platform="Linux" />
53+
<HelixAvailableTargetQueue Include="(Alpine.312.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.12-helix-20200908125345-56c6673" Platform="Linux" />
54+
</ItemGroup>
55+
<ItemGroup Condition="'$(TargetArchitecture)' == 'x64' AND '$(IsHelixDaily)' == 'true' AND '$(_UseHelixOpenQueues)' == 'true'">
56+
<!-- TODO Re-enable Win-7 queue when dotnet restore are fixed. https://github.com/dotnet/aspnetcore/issues/32683 -->
57+
<!-- <HelixAvailableTargetQueue Include="Windows.7.Amd64.Open" Platform="Windows" /> -->
58+
<HelixAvailableTargetQueue Include="Windows.81.Amd64.Open" Platform="Windows" />
59+
</ItemGroup>
60+
<ItemGroup Condition="'$(TargetArchitecture)' == 'x64' AND '$(IsHelixDaily)' == 'true' AND '$(_UseHelixOpenQueues)' != 'true'">
61+
<HelixAvailableTargetQueue Include="Windows.10.Amd64.ClientPre.VS2019.Pre" Platform="Windows" />
62+
>>>>>>> 83f7970b8c... Clean out Ubuntu 16.04 testing (#32894)
3863
</ItemGroup>
3964

4065
<!-- arm64 queues for helix-matrix.yml pipeline -->

‎eng/targets/Helix.targets

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,36 @@
88
<HelixPreCommand Include="call RunPowershell.cmd mssql\InstallSqlServerLocalDB.ps1 || exit /b 1" />
99
</ItemGroup>
1010

11+
<<<<<<< HEAD
12+
=======
13+
<PropertyGroup Condition="'$(TestDependsOnPlaywright)' == 'true'">
14+
<SkipHelixQueues>
15+
(Alpine.312.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.12-helix-20200908125345-56c6673;
16+
(Fedora.33.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:fedora-33-helix-20210120000908-a9df267
17+
Debian.9.Amd64.Open;
18+
Redhat.7.Amd64.Open;
19+
Ubuntu.2004.Amd64.Open;
20+
Windows.7.Amd64.Open;
21+
Windows.81.Amd64.Open;
22+
</SkipHelixQueues>
23+
<SkipHelixArm>true</SkipHelixArm>
24+
</PropertyGroup>
25+
26+
<ItemGroup Condition="'$(TestDependsOnPlaywright)' == 'true' AND '$(IsWindowsHelixQueue)' == 'true'">
27+
<HelixPreCommand Include="call RunPowershell.cmd installPlaywrightReqs.ps1 || exit /b 1" />
28+
</ItemGroup>
29+
30+
<ItemGroup Condition="'$(TestDependsOnIIS)' == 'true' AND '$(IsWindowsOnlyTest)' == 'true'">
31+
<HelixContent Include="$(RepoRoot)src\Servers\IIS\tools\update_schema.ps1" />
32+
<HelixContent Include="$(RepoRoot)src\Servers\IIS\tools\UpdateIISExpressCertificate.ps1" />
33+
<HelixContent Include="$(RepoRoot)src\Servers\IIS\tools\TestCert.pfx" />
34+
<HelixContent Include="$(RepoRoot)src\Servers\IIS\AspNetCoreModuleV2\AspNetCore\aspnetcore_schema_v2.xml" />
35+
36+
<HelixPreCommand Include="call RunPowershell.cmd update_schema.ps1 || exit /b 1" />
37+
<HelixPreCommand Include="call RunPowershell.cmd UpdateIISExpressCertificate.ps1 || exit /b 1" />
38+
</ItemGroup>
39+
40+
>>>>>>> 83f7970b8c... Clean out Ubuntu 16.04 testing (#32894)
1141
<ItemGroup Condition="'$(TestDependsOnNode)' == 'true' AND '$(IsWindowsHelixQueue)' == 'false'">
1242
<HelixPreCommand Include="./installnode.sh $(NodeVersion) $(TargetArchitecture)" />
1343
</ItemGroup>

‎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)