Skip to content

Commit 18409d9

Browse files
dougbudougbu
authored
[release/5.0] Clean out Ubuntu 16.04 testing (#33103)
* [release/5.0] Clean out Ubuntu 16.04 testing - cherry-pick of #32894 * Clean out Ubuntu 16.04 testing - use Ubuntu 18.04 agents for testing in Docker containers on Helix - also move to supported version of Fedora * Support added `msbuild` arguments in RunHelix.ps1 - bring in part of 0551cef (#32554) - no reason to maintain major differences from main version of script - slight difference is we still test on Windows.10.Amd64.Open by default here nits: - clean up a few old mentions of Centos and Fedora testing - fix `%(Platform)` metadata for OSX `@(HelixAvailableTargetQueue)` items - pick up a small bit of the master -> main renaming improvements - use `[switch]` instead of `[bool]` in RunHelix.ps1 parameters
1 parent e8bafa3 commit 18409d9

File tree

6 files changed

+30
-20
lines changed

6 files changed

+30
-20
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 & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,17 @@ 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)
23-
- The queues are defined in [Helix.Common.props](https://github.com/dotnet/aspnetcore/blob/master/eng/targets/Helix.Common.props)
21+
- Required queues: Windows10, OSX, Ubuntu1804
22+
- Full queue matrix: Windows[7, 81, 10], Ubuntu[1804, 2004], Debian9, Redhat7, Arm64 (Win10, Debian9)
23+
- 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.
2626

27-
[aspnetcore-helix-matrix](https://dev.azure.com/dnceng/public/_build?definitionId=837) runs non quarantined tests against all queues twice a day only on public master.
27+
[aspnetcore-helix-matrix](https://dev.azure.com/dnceng/public/_build?definitionId=837) runs non quarantined tests against all queues twice a day only on public main.
2828

29-
[aspnetcore-quarantined-pr](https://dev.azure.com/dnceng/public/_build?definitionId=869) runs only quarantined tests against the required queues on PRs and on master every 4 hours.
29+
[aspnetcore-quarantined-pr](https://dev.azure.com/dnceng/public/_build?definitionId=869) runs only quarantined tests against the required queues on PRs and on main every 4 hours.
3030

31-
[aspnetcore-quarantined-tests](https://dev.azure.com/dnceng/public/_build?definitionId=331) runs only quarantined tests against all queues only on public master once a day at 11 PM.
31+
[aspnetcore-quarantined-tests](https://dev.azure.com/dnceng/public/_build?definitionId=331) runs only quarantined tests against all queues only on public main once a day at 11 PM.
3232

3333
You can always manually queue pipeline runs by clicking on the link to the pipeline -> Run Pipeline -> select your branch/tag and commit
3434

‎eng/scripts/RunHelix.ps1

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,38 @@
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
12+
Ubuntu.2004.Amd64.Open
1313
Windows.10.Amd64.Open
14+
Windows.10.Amd64.Server20H2.Open
1415
Windows.81.Amd64.Open
1516
Windows.7.Amd64.Open
1617
OSX.1014.Amd64.Open
17-
Centos.7.Amd64.Open
1818
Debian.9.Amd64.Open
1919
Redhat.7.Amd64.Open
2020
.PARAMETER RunQuarantinedTests
2121
By default quarantined tests are not run. Set this to $true to run only the quarantined tests.
22+
.PARAMETER TargetArchitecture
23+
The CPU architecture to build for (x64, x86, arm). Default=x64
24+
.PARAMETER MSBuildArguments
25+
Additional MSBuild arguments to be passed through.
2226
#>
27+
[CmdletBinding(PositionalBinding = $false)]
2328
param(
2429
[Parameter(Mandatory=$true)]
2530
[string]$Project,
31+
2632
[string]$HelixQueues = "Windows.10.Amd64.Open",
33+
[switch]$RunQuarantinedTests,
34+
35+
[ValidateSet('x64', 'x86', 'arm', 'arm64')]
2736
[string]$TargetArchitecture = "x64",
28-
[bool]$RunQuarantinedTests = $false
37+
38+
# Capture the rest
39+
[Parameter(ValueFromRemainingArguments = $true)]
40+
[string[]]$MSBuildArguments
2941
)
42+
3043
$ErrorActionPreference = 'Stop'
3144
$ProgressPreference = 'SilentlyContinue' # Workaround PowerShell/PowerShell#2138
3245

@@ -43,4 +56,5 @@ Write-Host -ForegroundColor Yellow "And if packing for a different platform, add
4356
$HelixQueues = $HelixQueues -replace ";", "%3B"
4457
dotnet msbuild $Project /t:Helix /p:TargetArchitecture="$TargetArchitecture" /p:IsRequiredCheck=true `
4558
/p:IsHelixDaily=true /p:HelixTargetQueues=$HelixQueues /p:RunQuarantinedTests=$RunQuarantinedTests `
46-
/p:_UseHelixOpenQueues=true /p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
59+
/p:_UseHelixOpenQueues=true /p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log `
60+
@MSBuildArguments

‎eng/targets/Helix.Common.props

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,20 @@
2020

2121
<!-- PR(ci.yaml) required queues -->
2222
<ItemGroup Condition="'$(IsRequiredCheck)' == 'true' AND '$(TargetArchitecture)' == 'x64'">
23-
<HelixAvailableTargetQueue Include="Ubuntu.1604.Amd64.Open" Platform="Linux" />
23+
<HelixAvailableTargetQueue Include="Ubuntu.1804.Amd64.Open" Platform="Linux" />
2424
<HelixAvailableTargetQueue Include="Windows.10.Amd64.Open" Platform="Windows" />
25-
<HelixAvailableTargetQueue Include="OSX.1014.Amd64.Open" Platform="Linux" />
25+
<HelixAvailableTargetQueue Include="OSX.1014.Amd64.Open" Platform="OSX" />
2626
</ItemGroup>
2727

2828
<!-- queues for helix-matrix.yml pipeline -->
2929
<ItemGroup Condition="'$(IsWindowsOnlyTest)' != 'true' AND '$(TargetArchitecture)' == 'x64' AND '$(IsHelixDaily)' == 'true'">
3030
<HelixAvailableTargetQueue Include="Windows.7.Amd64.Open" Platform="Windows" />
3131
<HelixAvailableTargetQueue Include="Windows.81.Amd64.Open" Platform="Windows" />
3232
<HelixAvailableTargetQueue Include="Windows.10.Amd64.Server20H1.Open" Platform="Windows" />
33-
<HelixAvailableTargetQueue Include="Ubuntu.1804.Amd64.Open" Platform="Linux" />
3433
<HelixAvailableTargetQueue Include="Ubuntu.2004.Amd64.Open" Platform="Linux" />
3534
<HelixAvailableTargetQueue Include="Debian.9.Amd64.Open" Platform="Linux" />
3635
<HelixAvailableTargetQueue Include="Redhat.7.Amd64.Open" Platform="Linux" />
37-
<HelixAvailableTargetQueue Include="(Fedora.28.Amd64.Open)Ubuntu.1604[email protected]/dotnet-buildtools/prereqs:fedora-28-helix-09ca40b-20190508143249" Platform="Linux" />
36+
<HelixAvailableTargetQueue Include="(Fedora.33.Amd64.Open)Ubuntu.1804[email protected]/dotnet-buildtools/prereqs:fedora-33-helix-20210120000908-a9df267" Platform="Linux" />
3837
</ItemGroup>
3938

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

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