[release/6.0] Test on CentOS 7, not RedHat 7 (#58561)

- dotnet/dnceng#4298 part II/II - contributes to dotnet/dnceng#3189 - use Docker container for CentOS, mimicking dotnet/runtime#105063
dotnet · Nov 5, 2024 · e185938 · e185938
1 parent 22bcff0
commit e185938
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 13 deletions.
diff --git a/eng/helix/helix.proj b/eng/helix/helix.proj
@@ -50,7 +50,7 @@
     <AdditionalDotNetPackage Include="$(MicrosoftNETCoreBrowserDebugHostTransportVersion)">
       <PackageType>runtime</PackageType>
     </AdditionalDotNetPackage>
-    
+
     <AdditionalDotNetPackageFeed Include="https://dotnetbuilds.blob.core.windows.net/internal"
                                  Condition="'$(SYSTEM_TEAMPROJECT)' == 'internal'">
       <SasToken>$([System.Environment]::GetEnvironmentVariable('DotNetBuildsInternalReadSasToken'))</SasToken>

diff --git 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)[email protected]/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
@@ -2,6 +2,7 @@
   <!-- this file is shared between Helix.proj and .csproj files -->
   <PropertyGroup>
     <HelixQueueAlpine317>(Alpine.317.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.17-helix-amd64</HelixQueueAlpine317>
+    <HelixQueueCentos7>(Centos.7.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:centos-7-mlnet-helix</HelixQueueCentos7>
     <HelixQueueDebian11>(Debian.11.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:debian-11-helix-amd64</HelixQueueDebian11>
     <HelixQueueFedora38>(Fedora.38.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:fedora-38-helix</HelixQueueFedora38>
     <HelixQueueMariner>(Mariner)[email protected]/dotnet-buildtools/prereqs:cbl-mariner-2.0-helix-amd64</HelixQueueMariner>
@@ -27,14 +28,12 @@
 
   <!-- x64 Queues for public helix-matrix.yml and quarantine pipelines, except in windows-only cases -->
   <ItemGroup Condition="'$(TargetArchitecture)' == 'x64' AND '$(IsHelixDaily)' == 'true' AND '$(_UseHelixOpenQueues)' == 'true' AND '$(IsWindowsOnlyTest)' != 'true'">
-    <!-- Linux -->
-    <HelixAvailableTargetQueue Include="Redhat.7.Amd64.Open" Platform="Linux" />
-
     <!-- Mac -->
     <HelixAvailableTargetQueue Include="OSX.13.Amd64.Open" Platform="OSX" />
 
     <!-- Containers -->
     <HelixAvailableTargetQueue Include="$(HelixQueueAlpine317)" Platform="Linux" />
+    <HelixAvailableTargetQueue Include="$(HelixQueueCentos7)" Platform="Linux" />
     <HelixAvailableTargetQueue Include="$(HelixQueueDebian11)" Platform="Linux" />
     <HelixAvailableTargetQueue Include="$(HelixQueueFedora38)" Platform="Linux" />
     <HelixAvailableTargetQueue Include="$(HelixQueueMariner)" Platform="Linux" />

diff --git a/eng/targets/Helix.targets b/eng/targets/Helix.targets
@@ -11,10 +11,10 @@
   <PropertyGroup Condition="'$(TestDependsOnPlaywright)' == 'true'">
     <SkipHelixQueues>
       $(HelixQueueAlpine317);
+      $(HelixQueueCentos7);
       $(HelixQueueDebian11);
       $(HelixQueueFedora38);
       $(HelixQueueMariner);
-      Redhat.7.Amd64.Open;
       Ubuntu.2004.Amd64.Open;
     </SkipHelixQueues>
     <SkipHelixArm>true</SkipHelixArm>

diff --git 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
@@ -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;";
     }
 }