From 97577c8d0a0dc32a13a49d81f5657f981a071bf2 Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Mon, 21 Oct 2024 22:15:35 -0700 Subject: [PATCH] [release/6.0] Test on CentOS 7, not RedHat 7 - https://github.com/dotnet/dnceng/issues/4298 part II/II - contributes to https://github.com/dotnet/dnceng/issues/3189 - use Docker container for CentOS, mimicking https://github.com/dotnet/runtime/pull/105063 --- eng/helix/helix.proj | 2 +- eng/scripts/RunHelix.ps1 | 2 +- eng/targets/Helix.Common.props | 5 ++--- eng/targets/Helix.targets | 2 +- .../HttpsConnectionMiddlewareTests.cs | 12 ++++++------ src/Testing/src/xunit/HelixConstants.cs | 2 +- 6 files changed, 12 insertions(+), 13 deletions(-) diff --git a/eng/helix/helix.proj b/eng/helix/helix.proj index cbd82fae4fda..dc8c7a709a84 100644 --- a/eng/helix/helix.proj +++ b/eng/helix/helix.proj @@ -50,7 +50,7 @@ runtime - + $([System.Environment]::GetEnvironmentVariable('DotNetBuildsInternalReadSasToken')) diff --git a/eng/scripts/RunHelix.ps1 b/eng/scripts/RunHelix.ps1 index b29dec9ec80f..26cb5ff562dc 100644 --- a/eng/scripts/RunHelix.ps1 +++ b/eng/scripts/RunHelix.ps1 @@ -8,9 +8,9 @@ .PARAMETER HelixQueues Set the Helix queues to use. The list is '+' or ';'-separated. Some supported queues: + (Centos.7.Amd64.Open)Ubuntu.2204.Amd64.Open.svc@mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-mlnet-helix Debian.11.Amd64.Open Mariner - Redhat.7.Amd64.Open Ubuntu.2004.Amd64.Open OSX.1200.Amd64.Open Windows.10.Amd64.Server20H2.Open diff --git a/eng/targets/Helix.Common.props b/eng/targets/Helix.Common.props index 6a462b3b71ad..e99882ebf229 100644 --- a/eng/targets/Helix.Common.props +++ b/eng/targets/Helix.Common.props @@ -2,6 +2,7 @@ (Alpine.317.Amd64.Open)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.17-helix-amd64 + (Centos.7.Amd64.Open)Ubuntu.2204.Amd64.Open.svc@mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-mlnet-helix (Debian.11.Amd64.Open)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-amd64 (Fedora.38.Amd64.Open)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38-helix (Mariner)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-helix-amd64 @@ -27,14 +28,12 @@ - - - + diff --git a/eng/targets/Helix.targets b/eng/targets/Helix.targets index e77844c4f784..909eb8b791bb 100644 --- a/eng/targets/Helix.targets +++ b/eng/targets/Helix.targets @@ -11,10 +11,10 @@ $(HelixQueueAlpine317); + $(HelixQueueCentos7); $(HelixQueueDebian11); $(HelixQueueFedora38); $(HelixQueueMariner); - Redhat.7.Amd64.Open; Ubuntu.2004.Amd64.Open; true diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/HttpsConnectionMiddlewareTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/HttpsConnectionMiddlewareTests.cs index 3dfd7ba3a692..dc77db17907e 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/HttpsConnectionMiddlewareTests.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/HttpsConnectionMiddlewareTests.cs @@ -532,7 +532,7 @@ void ConfigureListenOptions(ListenOptions listenOptions) [InlineData(HttpProtocols.Http1)] [InlineData(HttpProtocols.Http1AndHttp2)] // Make sure turning on Http/2 doesn't regress HTTP/1 [OSSkipCondition(OperatingSystems.MacOSX, SkipReason = "Missing platform support.")] - [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/33566#issuecomment-892031659", Queues = HelixConstants.RedhatAmd64)] // Outdated OpenSSL client + [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/33566#issuecomment-892031659", Queues = HelixConstants.CentosAmd64)] // Outdated OpenSSL client public async Task CanRenegotiateForClientCertificate(HttpProtocols httpProtocols) { void ConfigureListenOptions(ListenOptions listenOptions) @@ -615,7 +615,7 @@ void ConfigureListenOptions(ListenOptions listenOptions) [ConditionalFact] [OSSkipCondition(OperatingSystems.MacOSX, SkipReason = "Missing platform support.")] - [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/33566#issuecomment-892031659", Queues = HelixConstants.RedhatAmd64)] // Outdated OpenSSL client + [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/33566#issuecomment-892031659", Queues = HelixConstants.CentosAmd64)] // Outdated OpenSSL client public async Task CanRenegotiateForTlsCallbackOptions() { void ConfigureListenOptions(ListenOptions listenOptions) @@ -663,7 +663,7 @@ void ConfigureListenOptions(ListenOptions listenOptions) [ConditionalFact] [OSSkipCondition(OperatingSystems.MacOSX, SkipReason = "Missing platform support.")] - [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/33566#issuecomment-892031659", Queues = HelixConstants.RedhatAmd64)] // Outdated OpenSSL client + [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/33566#issuecomment-892031659", Queues = HelixConstants.CentosAmd64)] // Outdated OpenSSL client public async Task CanRenegotiateForClientCertificateOnHttp1CanReturnNoCert() { void ConfigureListenOptions(ListenOptions listenOptions) @@ -714,7 +714,7 @@ void ConfigureListenOptions(ListenOptions listenOptions) // TLS 1.2 and lower have to renegotiate the whole connection to get a client cert, and if that hits an error // then the connection is aborted. [OSSkipCondition(OperatingSystems.MacOSX, SkipReason = "Missing platform support.")] - [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/33566#issuecomment-892031659", Queues = HelixConstants.RedhatAmd64)] // Outdated OpenSSL client + [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/33566#issuecomment-892031659", Queues = HelixConstants.CentosAmd64)] // Outdated OpenSSL client public async Task RenegotiateForClientCertificateOnPostWithoutBufferingThrows_TLS12() { void ConfigureListenOptions(ListenOptions listenOptions) @@ -760,7 +760,7 @@ void ConfigureListenOptions(ListenOptions listenOptions) // for this error. [MinimumOSVersion(OperatingSystems.Windows, "10.0.20145")] // Needs a preview version with TLS 1.3 enabled. [OSSkipCondition(OperatingSystems.MacOSX | OperatingSystems.Linux, SkipReason = "https://github.com/dotnet/runtime/issues/55757")] - [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/33566#issuecomment-892031659", Queues = HelixConstants.RedhatAmd64)] // Outdated OpenSSL client + [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/33566#issuecomment-892031659", Queues = HelixConstants.CentosAmd64)] // Outdated OpenSSL client public async Task RenegotiateForClientCertificateOnPostWithoutBufferingThrows_TLS13() { void ConfigureListenOptions(ListenOptions listenOptions) @@ -897,7 +897,7 @@ await stream.AuthenticateAsClientAsync(new SslClientAuthenticationOptions() [ConditionalFact] [OSSkipCondition(OperatingSystems.MacOSX, SkipReason = "Missing platform support.")] - [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/33566#issuecomment-892031659", Queues = HelixConstants.RedhatAmd64)] // Outdated OpenSSL client + [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/33566#issuecomment-892031659", Queues = HelixConstants.CentosAmd64)] // Outdated OpenSSL client public async Task CanRenegotiateForClientCertificateOnPostIfDrained() { void ConfigureListenOptions(ListenOptions listenOptions) diff --git a/src/Testing/src/xunit/HelixConstants.cs b/src/Testing/src/xunit/HelixConstants.cs index a9b6034e119b..ac853a49ee93 100644 --- a/src/Testing/src/xunit/HelixConstants.cs +++ b/src/Testing/src/xunit/HelixConstants.cs @@ -9,6 +9,6 @@ public static class HelixConstants public const string Windows11Arm64 = "Windows.11.Arm64.Open;"; public const string DebianAmd64 = "Debian.11.Amd64.Open;"; public const string DebianArm64 = "Debian.11.Arm64.Open;"; - public const string RedhatAmd64 = "Redhat.7.Amd64.Open;"; + public const string CentosAmd64 = "Centos.7.Amd64.Open;"; } }