Skip to content

Commit e185938

Browse files
dougbudougbu
authored
[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
1 parent 22bcff0 commit e185938

File tree

6 files changed

+12
-13
lines changed

6 files changed

+12
-13
lines changed

‎eng/helix/helix.proj

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
<AdditionalDotNetPackage Include="$(MicrosoftNETCoreBrowserDebugHostTransportVersion)">
5151
<PackageType>runtime</PackageType>
5252
</AdditionalDotNetPackage>
53-
53+
5454
<AdditionalDotNetPackageFeed Include="https://dotnetbuilds.blob.core.windows.net/internal"
5555
Condition="'$(SYSTEM_TEAMPROJECT)' == 'internal'">
5656
<SasToken>$([System.Environment]::GetEnvironmentVariable('DotNetBuildsInternalReadSasToken'))</SasToken>

‎eng/scripts/RunHelix.ps1

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
.PARAMETER HelixQueues
99
Set the Helix queues to use. The list is '+' or ';'-separated.
1010
Some supported queues:
11+
(Centos.7.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:centos-7-mlnet-helix
1112
Debian.11.Amd64.Open
1213
Mariner
13-
Redhat.7.Amd64.Open
1414
Ubuntu.2004.Amd64.Open
1515
OSX.1200.Amd64.Open
1616
Windows.10.Amd64.Server20H2.Open

‎eng/targets/Helix.Common.props

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<!-- this file is shared between Helix.proj and .csproj files -->
33
<PropertyGroup>
44
<HelixQueueAlpine317>(Alpine.317.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.17-helix-amd64</HelixQueueAlpine317>
5+
<HelixQueueCentos7>(Centos.7.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:centos-7-mlnet-helix</HelixQueueCentos7>
56
<HelixQueueDebian11>(Debian.11.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:debian-11-helix-amd64</HelixQueueDebian11>
67
<HelixQueueFedora38>(Fedora.38.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:fedora-38-helix</HelixQueueFedora38>
78
<HelixQueueMariner>(Mariner)[email protected]/dotnet-buildtools/prereqs:cbl-mariner-2.0-helix-amd64</HelixQueueMariner>
@@ -27,14 +28,12 @@
2728

2829
<!-- x64 Queues for public helix-matrix.yml and quarantine pipelines, except in windows-only cases -->
2930
<ItemGroup Condition="'$(TargetArchitecture)' == 'x64' AND '$(IsHelixDaily)' == 'true' AND '$(_UseHelixOpenQueues)' == 'true' AND '$(IsWindowsOnlyTest)' != 'true'">
30-
<!-- Linux -->
31-
<HelixAvailableTargetQueue Include="Redhat.7.Amd64.Open" Platform="Linux" />
32-
3331
<!-- Mac -->
3432
<HelixAvailableTargetQueue Include="OSX.13.Amd64.Open" Platform="OSX" />
3533

3634
<!-- Containers -->
3735
<HelixAvailableTargetQueue Include="$(HelixQueueAlpine317)" Platform="Linux" />
36+
<HelixAvailableTargetQueue Include="$(HelixQueueCentos7)" Platform="Linux" />
3837
<HelixAvailableTargetQueue Include="$(HelixQueueDebian11)" Platform="Linux" />
3938
<HelixAvailableTargetQueue Include="$(HelixQueueFedora38)" Platform="Linux" />
4039
<HelixAvailableTargetQueue Include="$(HelixQueueMariner)" Platform="Linux" />

‎eng/targets/Helix.targets

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
<PropertyGroup Condition="'$(TestDependsOnPlaywright)' == 'true'">
1212
<SkipHelixQueues>
1313
$(HelixQueueAlpine317);
14+
$(HelixQueueCentos7);
1415
$(HelixQueueDebian11);
1516
$(HelixQueueFedora38);
1617
$(HelixQueueMariner);
17-
Redhat.7.Amd64.Open;
1818
Ubuntu.2004.Amd64.Open;
1919
</SkipHelixQueues>
2020
<SkipHelixArm>true</SkipHelixArm>

‎src/Servers/Kestrel/test/InMemory.FunctionalTests/HttpsConnectionMiddlewareTests.cs

+6-6
Original file line numberDiff line numberDiff line change
@@ -532,7 +532,7 @@ void ConfigureListenOptions(ListenOptions listenOptions)
532532
[InlineData(HttpProtocols.Http1)]
533533
[InlineData(HttpProtocols.Http1AndHttp2)] // Make sure turning on Http/2 doesn't regress HTTP/1
534534
[OSSkipCondition(OperatingSystems.MacOSX, SkipReason = "Missing platform support.")]
535-
[SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/33566#issuecomment-892031659", Queues = HelixConstants.RedhatAmd64)] // Outdated OpenSSL client
535+
[SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/33566#issuecomment-892031659", Queues = HelixConstants.CentosAmd64)] // Outdated OpenSSL client
536536
public async Task CanRenegotiateForClientCertificate(HttpProtocols httpProtocols)
537537
{
538538
void ConfigureListenOptions(ListenOptions listenOptions)
@@ -615,7 +615,7 @@ void ConfigureListenOptions(ListenOptions listenOptions)
615615

616616
[ConditionalFact]
617617
[OSSkipCondition(OperatingSystems.MacOSX, SkipReason = "Missing platform support.")]
618-
[SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/33566#issuecomment-892031659", Queues = HelixConstants.RedhatAmd64)] // Outdated OpenSSL client
618+
[SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/33566#issuecomment-892031659", Queues = HelixConstants.CentosAmd64)] // Outdated OpenSSL client
619619
public async Task CanRenegotiateForTlsCallbackOptions()
620620
{
621621
void ConfigureListenOptions(ListenOptions listenOptions)
@@ -663,7 +663,7 @@ void ConfigureListenOptions(ListenOptions listenOptions)
663663

664664
[ConditionalFact]
665665
[OSSkipCondition(OperatingSystems.MacOSX, SkipReason = "Missing platform support.")]
666-
[SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/33566#issuecomment-892031659", Queues = HelixConstants.RedhatAmd64)] // Outdated OpenSSL client
666+
[SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/33566#issuecomment-892031659", Queues = HelixConstants.CentosAmd64)] // Outdated OpenSSL client
667667
public async Task CanRenegotiateForClientCertificateOnHttp1CanReturnNoCert()
668668
{
669669
void ConfigureListenOptions(ListenOptions listenOptions)
@@ -714,7 +714,7 @@ void ConfigureListenOptions(ListenOptions listenOptions)
714714
// TLS 1.2 and lower have to renegotiate the whole connection to get a client cert, and if that hits an error
715715
// then the connection is aborted.
716716
[OSSkipCondition(OperatingSystems.MacOSX, SkipReason = "Missing platform support.")]
717-
[SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/33566#issuecomment-892031659", Queues = HelixConstants.RedhatAmd64)] // Outdated OpenSSL client
717+
[SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/33566#issuecomment-892031659", Queues = HelixConstants.CentosAmd64)] // Outdated OpenSSL client
718718
public async Task RenegotiateForClientCertificateOnPostWithoutBufferingThrows_TLS12()
719719
{
720720
void ConfigureListenOptions(ListenOptions listenOptions)
@@ -760,7 +760,7 @@ void ConfigureListenOptions(ListenOptions listenOptions)
760760
// for this error.
761761
[MinimumOSVersion(OperatingSystems.Windows, "10.0.20145")] // Needs a preview version with TLS 1.3 enabled.
762762
[OSSkipCondition(OperatingSystems.MacOSX | OperatingSystems.Linux, SkipReason = "https://github.com/dotnet/runtime/issues/55757")]
763-
[SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/33566#issuecomment-892031659", Queues = HelixConstants.RedhatAmd64)] // Outdated OpenSSL client
763+
[SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/33566#issuecomment-892031659", Queues = HelixConstants.CentosAmd64)] // Outdated OpenSSL client
764764
public async Task RenegotiateForClientCertificateOnPostWithoutBufferingThrows_TLS13()
765765
{
766766
void ConfigureListenOptions(ListenOptions listenOptions)
@@ -897,7 +897,7 @@ await stream.AuthenticateAsClientAsync(new SslClientAuthenticationOptions()
897897

898898
[ConditionalFact]
899899
[OSSkipCondition(OperatingSystems.MacOSX, SkipReason = "Missing platform support.")]
900-
[SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/33566#issuecomment-892031659", Queues = HelixConstants.RedhatAmd64)] // Outdated OpenSSL client
900+
[SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/33566#issuecomment-892031659", Queues = HelixConstants.CentosAmd64)] // Outdated OpenSSL client
901901
public async Task CanRenegotiateForClientCertificateOnPostIfDrained()
902902
{
903903
void ConfigureListenOptions(ListenOptions listenOptions)

‎src/Testing/src/xunit/HelixConstants.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ public static class HelixConstants
99
public const string Windows11Arm64 = "Windows.11.Arm64.Open;";
1010
public const string DebianAmd64 = "Debian.11.Amd64.Open;";
1111
public const string DebianArm64 = "Debian.11.Arm64.Open;";
12-
public const string RedhatAmd64 = "Redhat.7.Amd64.Open;";
12+
public const string CentosAmd64 = "Centos.7.Amd64.Open;";
1313
}
1414
}

0 commit comments

Comments
 (0)