From 83f7970b8cf3d87299d564e713caa0310eaf326b Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Fri, 21 May 2021 17:46:08 -0700 Subject: [PATCH] Clean out Ubuntu 16.04 testing (#32894) * 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)` --- .azure/pipelines/jobs/default-build.yml | 4 ++-- .azure/pipelines/quarantined-pr.yml | 2 +- docs/Helix.md | 4 ++-- eng/scripts/RunHelix.ps1 | 7 +++---- eng/targets/Helix.Common.props | 9 ++++----- eng/targets/Helix.targets | 10 +++++++++- .../test/Identity.Test/IdentityUIScriptsTest.cs | 3 --- 7 files changed, 21 insertions(+), 18 deletions(-) diff --git a/.azure/pipelines/jobs/default-build.yml b/.azure/pipelines/jobs/default-build.yml index cd8196854c0..cdbf78a1a1e 100644 --- a/.azure/pipelines/jobs/default-build.yml +++ b/.azure/pipelines/jobs/default-build.yml @@ -105,10 +105,10 @@ jobs: ${{ if eq(parameters.useHostedUbuntu, false) }}: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: NetCorePublic-Pool - queue: BuildPool.Ubuntu.1604.Amd64.Open + queue: BuildPool.Ubuntu.1804.Amd64.Open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: NetCoreInternal-Pool - queue: BuildPool.Ubuntu.1604.Amd64 + queue: BuildPool.Ubuntu.1804.Amd64 ${{ if eq(parameters.agentOs, 'Windows') }}: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: NetCorePublic-Pool diff --git a/.azure/pipelines/quarantined-pr.yml b/.azure/pipelines/quarantined-pr.yml index 26b44e9716d..911cf040f56 100644 --- a/.azure/pipelines/quarantined-pr.yml +++ b/.azure/pipelines/quarantined-pr.yml @@ -149,7 +149,7 @@ jobs: - template: jobs/default-build.yml parameters: jobName: Linux_Quarantined_Test - jobDisplayName: "Tests: Ubuntu 16.04 x64" + jobDisplayName: "Tests: Ubuntu 18.04 x64" agentOs: Linux timeoutInMinutes: 60 isTestingJob: true diff --git a/docs/Helix.md b/docs/Helix.md index ef7190b7050..c5584125677 100644 --- a/docs/Helix.md +++ b/docs/Helix.md @@ -18,8 +18,8 @@ This will restore, and then publish all the test project including some bootstra ## Overview of the helix usage in our pipelines -- Required queues: Windows10, OSX, Ubuntu1604 -- Full queue matrix: Windows[7, 81, 10], Ubuntu[1604, 1804, 2004], Centos7, Debian9, Redhat7, Fedora28, Arm64 (Win10, Debian9) +- Required queues: Windows10, OSX, Ubuntu1804 +- Full queue matrix: Windows[7, 81, 10], Ubuntu[1804, 2004], Debian9, Redhat7, Arm64 (Win10, Debian9) - The queues are defined in [Helix.Common.props](https://github.com/dotnet/aspnetcore/blob/main/eng/targets/Helix.Common.props) [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. diff --git a/eng/scripts/RunHelix.ps1 b/eng/scripts/RunHelix.ps1 index 1b84421b694..2465657112a 100644 --- a/eng/scripts/RunHelix.ps1 +++ b/eng/scripts/RunHelix.ps1 @@ -8,13 +8,12 @@ .PARAMETER HelixQueues Set the Helix queues to use. The list is '+' or ';'-separated. Some supported queues: - Ubuntu.1604.Amd64.Open Ubuntu.1804.Amd64.Open - Windows.10.Amd64.Open + Ubuntu.2004.Amd64.Open + Windows.10.Amd64.Server20H2.Open Windows.81.Amd64.Open Windows.7.Amd64.Open OSX.1014.Amd64.Open - Centos.7.Amd64.Open Debian.9.Amd64.Open Redhat.7.Amd64.Open .PARAMETER RunQuarantinedTests @@ -29,7 +28,7 @@ param( [Parameter(Mandatory=$true)] [string]$Project, - [string]$HelixQueues = "Windows.10.Amd64.Open", + [string]$HelixQueues = "Windows.10.Amd64.Server20H2.Open", [switch]$RunQuarantinedTests, [ValidateSet('x64', 'x86', 'arm', 'arm64')] diff --git a/eng/targets/Helix.Common.props b/eng/targets/Helix.Common.props index 0bad4a134b9..cbf09bc00a0 100644 --- a/eng/targets/Helix.Common.props +++ b/eng/targets/Helix.Common.props @@ -14,18 +14,17 @@ - + - - + - - + + diff --git a/eng/targets/Helix.targets b/eng/targets/Helix.targets index 46c7abe4b37..920c5a95822 100644 --- a/eng/targets/Helix.targets +++ b/eng/targets/Helix.targets @@ -9,7 +9,15 @@ - 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 + + (Alpine.312.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.12-helix-20200908125345-56c6673; + (Fedora.33.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-helix-20210120000908-a9df267 + Debian.9.Amd64.Open; + Redhat.7.Amd64.Open; + Ubuntu.2004.Amd64.Open; + Windows.7.Amd64.Open; + Windows.81.Amd64.Open; + true diff --git a/src/Identity/test/Identity.Test/IdentityUIScriptsTest.cs b/src/Identity/test/Identity.Test/IdentityUIScriptsTest.cs index 71712b382bb..fc7f282f772 100644 --- a/src/Identity/test/Identity.Test/IdentityUIScriptsTest.cs +++ b/src/Identity/test/Identity.Test/IdentityUIScriptsTest.cs @@ -79,9 +79,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Theory] [MemberData(nameof(ScriptWithFallbackSrcData))] - // Ubuntu 16 uses an old version of OpenSSL that doesn't work well when an intermediate CA is expired. - // We've decided to not run these tests against that OS anymore and will run on newer versions of Ubuntu. - [SkipOnHelix("Skip on Ubuntu 16", Queues = "Ubuntu.1604.Amd64.Open;Ubuntu.1604.Amd64")] public async Task IdentityUI_ScriptTags_FallbackSourceContent_Matches_CDNContent(ScriptTag scriptTag) { var wwwrootDir = Path.Combine(GetProjectBasePath(), "wwwroot", scriptTag.Version);