Skip to content

Commit e6b9a3d

Browse files
authored
Remove debian 8 from helix runs (#24454)
* Add display environment * Print out env variables as part of helix runs * Update TestRunner.cs * Remove Debian 8 from helix matrix * Remove Debian 8 skip * Remove debian 8 skip * Remove debian 8 * Remove debian 8 skip * Remove Debian 8 skip * Remove debian 8 * Update Program.cs * Update TestRunner.cs * Update TestRunner.cs
1 parent c0c0a26 commit e6b9a3d

File tree

7 files changed

+3
-11
lines changed

7 files changed

+3
-11
lines changed

docs/Helix.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ This will restore, and then publish all the test project including some bootstra
1919
## Overview of the helix usage in our pipelines
2020

2121
- Required queues: Windows10, OSX, Ubuntu1604
22-
- Full queue matrix: Windows[7, 81, 10], Ubuntu[1604, 1804, 2004], Centos7, Debian[8,9], Redhat7, Fedora28, Arm64 (Win10, Debian9)
22+
- Full queue matrix: Windows[7, 81, 10], Ubuntu[1604, 1804, 2004], Centos7, Debian9, Redhat7, Fedora28, Arm64 (Win10, Debian9)
2323
- The queues are defined in [Helix.Common.props](https://github.com/dotnet/aspnetcore/blob/master/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.

eng/scripts/RunHelix.ps1

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
Windows.7.Amd64.Open
1616
OSX.1014.Amd64.Open
1717
Centos.7.Amd64.Open
18-
Debian.8.Amd64.Open
1918
Debian.9.Amd64.Open
2019
Redhat.7.Amd64.Open
2120
.PARAMETER RunQuarantinedTests
@@ -39,4 +38,4 @@ $env:BUILD_REPOSITORY_NAME="aspnetcore"
3938
$env:SYSTEM_TEAMPROJECT="aspnetcore"
4039

4140
$HelixQueues = $HelixQueues -replace ";", "%3B"
42-
dotnet msbuild $Project /t:Helix /p:TargetArchitecture="$TargetArchitecture" /p:IsRequiredCheck=true /p:IsHelixDaily=true /p:HelixTargetQueues=$HelixQueues /p:RunQuarantinedTests=$RunQuarantinedTests /p:_UseHelixOpenQueues=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
41+
dotnet msbuild $Project /t:Helix /p:TargetArchitecture="$TargetArchitecture" /p:IsRequiredCheck=true /p:IsHelixDaily=true /p:HelixTargetQueues=$HelixQueues /p:RunQuarantinedTests=$RunQuarantinedTests /p:_UseHelixOpenQueues=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log

eng/targets/Helix.Common.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
<HelixAvailableTargetQueue Include="Ubuntu.1804.Amd64.Open" Platform="Linux" />
3333
<HelixAvailableTargetQueue Include="Ubuntu.2004.Amd64.Open" Platform="Linux" />
3434
<HelixAvailableTargetQueue Include="Centos.7.Amd64.Open" Platform="Linux" />
35-
<HelixAvailableTargetQueue Include="Debian.8.Amd64.Open" Platform="Linux" />
3635
<HelixAvailableTargetQueue Include="Debian.9.Amd64.Open" Platform="Linux" />
3736
<HelixAvailableTargetQueue Include="Redhat.7.Amd64.Open" Platform="Linux" />
3837
<HelixAvailableTargetQueue Include="(Fedora.28.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:fedora-28-helix-09ca40b-20190508143249" Platform="Linux" />

src/Servers/Kestrel/test/FunctionalTests/Http2/HandshakeTests.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ public void TlsAndHttp2NotSupportedOnWin7()
8080

8181
[ConditionalFact]
8282
[OSSkipCondition(OperatingSystems.MacOSX, SkipReason = "Missing SslStream ALPN support: https://github.com/dotnet/corefx/issues/30492")]
83-
[SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/10428", Queues = "Debian.8.Amd64;Debian.8.Amd64.Open")] // Debian 8 uses OpenSSL 1.0.1 which does not support HTTP/2
8483
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10)]
8584
public async Task TlsAlpnHandshakeSelectsHttp2From1and2()
8685
{
@@ -111,7 +110,6 @@ public async Task TlsAlpnHandshakeSelectsHttp2From1and2()
111110

112111
[ConditionalFact]
113112
[OSSkipCondition(OperatingSystems.MacOSX, SkipReason = "Missing SslStream ALPN support: https://github.com/dotnet/corefx/issues/30492")]
114-
[SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/10428", Queues = "Debian.8.Amd64;Debian.8.Amd64.Open")] // Debian 8 uses OpenSSL 1.0.1 which does not support HTTP/2
115113
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10)]
116114
public async Task TlsAlpnHandshakeSelectsHttp2()
117115
{

src/Servers/Kestrel/test/FunctionalTests/Http2/ShutdownTests.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests.Http2
2323
{
2424
[OSSkipCondition(OperatingSystems.MacOSX, SkipReason = "Missing SslStream ALPN support: https://github.com/dotnet/corefx/issues/30492")]
2525
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10)]
26-
[SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/10428", Queues = "Debian.8.Amd64;Debian.8.Amd64.Open")] // Debian 8 uses OpenSSL 1.0.1 which does not support HTTP/2
2726
public class ShutdownTests : TestApplicationErrorLoggerLoggedTest
2827
{
2928
private static X509Certificate2 _x509Certificate2 = TestResources.GetTestCertificate();

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -632,7 +632,6 @@ public void ThrowsForCertificatesMissingServerEku(string testCertName)
632632
[InlineData(HttpProtocols.Http2)]
633633
[InlineData(HttpProtocols.Http1AndHttp2)]
634634
[OSSkipCondition(OperatingSystems.MacOSX, SkipReason = "Missing SslStream ALPN support: https://github.com/dotnet/corefx/issues/30492")]
635-
[SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/10428", Queues = "Debian.8.Amd64;Debian.8.Amd64.Open")] // Debian 8 uses OpenSSL 1.0.1 which does not support HTTP/2
636635
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10)]
637636
public async Task ListenOptionsProtolsCanBeSetAfterUseHttps(HttpProtocols httpProtocols)
638637
{

src/Servers/Kestrel/test/Interop.FunctionalTests/Utilities.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@ internal static bool CurrentPlatformSupportsHTTP2OverTls()
1212
return // "Missing Windows ALPN support: https://en.wikipedia.org/wiki/Application-Layer_Protocol_Negotiation#Support" or missing compatible ciphers (Win8.1)
1313
new MinimumOSVersionAttribute(OperatingSystems.Windows, WindowsVersions.Win10).IsMet
1414
// "Missing SslStream ALPN support: https://github.com/dotnet/corefx/issues/30492"
15-
&& new OSSkipConditionAttribute(OperatingSystems.MacOSX).IsMet
16-
// Debian 8 uses OpenSSL 1.0.1 which does not support ALPN
17-
&& new SkipOnHelixAttribute("https://github.com/dotnet/aspnetcore/issues/10428") { Queues = "Debian.8.Amd64;Debian.8.Amd64.Open" }.IsMet;
15+
&& new OSSkipConditionAttribute(OperatingSystems.MacOSX).IsMet;
1816
}
1917
}
2018
}

0 commit comments

Comments
 (0)