From 14fa286f9850249850c9059469f59c6fcf42544a Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Thu, 30 Jul 2020 16:04:16 -0700 Subject: [PATCH 01/13] Add display environment --- eng/helix/content/RunTests/TestRunner.cs | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/eng/helix/content/RunTests/TestRunner.cs b/eng/helix/content/RunTests/TestRunner.cs index da4b4c228f0c..1d9a3fdd9047 100644 --- a/eng/helix/content/RunTests/TestRunner.cs +++ b/eng/helix/content/RunTests/TestRunner.cs @@ -65,6 +65,20 @@ public bool SetupEnvironment() return false; } } + + public void DisplayEnvironment() + { + Console.WriteLine("KeyValue pairs from Environment.GetEnvironmentVariables():"); + foreach (DictionaryEntry pair in Environment.GetEnvironmentVariables()) + { + Console.WriteLine(pair.Key + "=" + pair.Value); + } + Console.WriteLine("KeyValue pairs from TestRunner.EnvironmentVariables"); + foreach (DictionaryEntry pair in EnvironmentVariables) + { + Console.WriteLine(pair.Key + "=" + pair.Value); + } + } public void DisplayContents(string path = "./") { From f7e15c73d8cfb9ec5cc6bb0296a1f0894ae93162 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Thu, 30 Jul 2020 16:04:49 -0700 Subject: [PATCH 02/13] Print out env variables as part of helix runs --- eng/helix/content/RunTests/Program.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/helix/content/RunTests/Program.cs b/eng/helix/content/RunTests/Program.cs index 349ab29b8a03..f37b6362c6ff 100644 --- a/eng/helix/content/RunTests/Program.cs +++ b/eng/helix/content/RunTests/Program.cs @@ -29,6 +29,7 @@ static async Task Main(string[] args) } runner.DisplayContents(); + runner.DisplayEnvironment(); if (keepGoing) { From e4ae34edd3fcdde37b699250a3fb9a1544e1db44 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Thu, 30 Jul 2020 23:11:54 -0700 Subject: [PATCH 03/13] Update TestRunner.cs --- eng/helix/content/RunTests/TestRunner.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eng/helix/content/RunTests/TestRunner.cs b/eng/helix/content/RunTests/TestRunner.cs index 1d9a3fdd9047..25833dcf3f9d 100644 --- a/eng/helix/content/RunTests/TestRunner.cs +++ b/eng/helix/content/RunTests/TestRunner.cs @@ -2,6 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; +using System.Collections; using System.Collections.Generic; using System.IO; using System.IO.Compression; @@ -74,7 +75,7 @@ public void DisplayEnvironment() Console.WriteLine(pair.Key + "=" + pair.Value); } Console.WriteLine("KeyValue pairs from TestRunner.EnvironmentVariables"); - foreach (DictionaryEntry pair in EnvironmentVariables) + foreach (KeyValuePair pair in EnvironmentVariables) { Console.WriteLine(pair.Key + "=" + pair.Value); } From 6ec71518c780f30e06e601489c36b2aea4922c50 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Fri, 31 Jul 2020 09:58:02 -0700 Subject: [PATCH 04/13] Remove Debian 8 from helix matrix --- eng/targets/Helix.Common.props | 1 - 1 file changed, 1 deletion(-) diff --git a/eng/targets/Helix.Common.props b/eng/targets/Helix.Common.props index 5f8a83cb6d61..d68970f8dc68 100644 --- a/eng/targets/Helix.Common.props +++ b/eng/targets/Helix.Common.props @@ -32,7 +32,6 @@ - From 883e9b6b29a35c43f65a7bd0875b6160d64f5306 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Fri, 31 Jul 2020 09:59:55 -0700 Subject: [PATCH 05/13] Remove Debian 8 skip --- src/Servers/Kestrel/test/Interop.FunctionalTests/Utilities.cs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/Servers/Kestrel/test/Interop.FunctionalTests/Utilities.cs b/src/Servers/Kestrel/test/Interop.FunctionalTests/Utilities.cs index d2e2ce85a4d2..21b18f8aee01 100644 --- a/src/Servers/Kestrel/test/Interop.FunctionalTests/Utilities.cs +++ b/src/Servers/Kestrel/test/Interop.FunctionalTests/Utilities.cs @@ -12,9 +12,7 @@ internal static bool CurrentPlatformSupportsHTTP2OverTls() return // "Missing Windows ALPN support: https://en.wikipedia.org/wiki/Application-Layer_Protocol_Negotiation#Support" or missing compatible ciphers (Win8.1) new MinimumOSVersionAttribute(OperatingSystems.Windows, WindowsVersions.Win10).IsMet // "Missing SslStream ALPN support: https://github.com/dotnet/corefx/issues/30492" - && new OSSkipConditionAttribute(OperatingSystems.MacOSX).IsMet - // Debian 8 uses OpenSSL 1.0.1 which does not support ALPN - && new SkipOnHelixAttribute("https://github.com/dotnet/aspnetcore/issues/10428") { Queues = "Debian.8.Amd64;Debian.8.Amd64.Open" }.IsMet; + && new OSSkipConditionAttribute(OperatingSystems.MacOSX).IsMet; } } } From a8f1df5373a70fc32282f995509cf5c252a7c422 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Fri, 31 Jul 2020 10:01:03 -0700 Subject: [PATCH 06/13] Remove debian 8 skip --- .../Kestrel/test/FunctionalTests/Http2/HandshakeTests.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/Servers/Kestrel/test/FunctionalTests/Http2/HandshakeTests.cs b/src/Servers/Kestrel/test/FunctionalTests/Http2/HandshakeTests.cs index c4a89e9fcfca..620c08a73e2a 100644 --- a/src/Servers/Kestrel/test/FunctionalTests/Http2/HandshakeTests.cs +++ b/src/Servers/Kestrel/test/FunctionalTests/Http2/HandshakeTests.cs @@ -80,7 +80,6 @@ public void TlsAndHttp2NotSupportedOnWin7() [ConditionalFact] [OSSkipCondition(OperatingSystems.MacOSX, SkipReason = "Missing SslStream ALPN support: https://github.com/dotnet/corefx/issues/30492")] - [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 [MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10)] public async Task TlsAlpnHandshakeSelectsHttp2From1and2() { @@ -111,7 +110,6 @@ public async Task TlsAlpnHandshakeSelectsHttp2From1and2() [ConditionalFact] [OSSkipCondition(OperatingSystems.MacOSX, SkipReason = "Missing SslStream ALPN support: https://github.com/dotnet/corefx/issues/30492")] - [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 [MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10)] public async Task TlsAlpnHandshakeSelectsHttp2() { From 63e51a40c9ef7ecea1270551aa98bab606d8a1e8 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Fri, 31 Jul 2020 10:02:15 -0700 Subject: [PATCH 07/13] Remove debian 8 --- eng/scripts/RunHelix.ps1 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/eng/scripts/RunHelix.ps1 b/eng/scripts/RunHelix.ps1 index b2200d37fdb0..2a20580c3a55 100644 --- a/eng/scripts/RunHelix.ps1 +++ b/eng/scripts/RunHelix.ps1 @@ -15,7 +15,6 @@ Windows.7.Amd64.Open OSX.1014.Amd64.Open Centos.7.Amd64.Open - Debian.8.Amd64.Open Debian.9.Amd64.Open Redhat.7.Amd64.Open .PARAMETER RunQuarantinedTests @@ -39,4 +38,4 @@ $env:BUILD_REPOSITORY_NAME="aspnetcore" $env:SYSTEM_TEAMPROJECT="aspnetcore" $HelixQueues = $HelixQueues -replace ";", "%3B" -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 \ No newline at end of file +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 From 89d10d6b524df6c8fca78430d5e55c4f53f4a567 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Fri, 31 Jul 2020 10:02:52 -0700 Subject: [PATCH 08/13] Remove debian 8 skip --- src/Servers/Kestrel/test/FunctionalTests/Http2/ShutdownTests.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Servers/Kestrel/test/FunctionalTests/Http2/ShutdownTests.cs b/src/Servers/Kestrel/test/FunctionalTests/Http2/ShutdownTests.cs index d5788e336912..e8537520d1c5 100644 --- a/src/Servers/Kestrel/test/FunctionalTests/Http2/ShutdownTests.cs +++ b/src/Servers/Kestrel/test/FunctionalTests/Http2/ShutdownTests.cs @@ -23,7 +23,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests.Http2 { [OSSkipCondition(OperatingSystems.MacOSX, SkipReason = "Missing SslStream ALPN support: https://github.com/dotnet/corefx/issues/30492")] [MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10)] - [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 public class ShutdownTests : TestApplicationErrorLoggerLoggedTest { private static X509Certificate2 _x509Certificate2 = TestResources.GetTestCertificate(); From 1f415d2cbbb88c4999f0ec5553a101e2a4b928c6 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Fri, 31 Jul 2020 10:03:53 -0700 Subject: [PATCH 09/13] Remove Debian 8 skip --- .../InMemory.FunctionalTests/HttpsConnectionMiddlewareTests.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/HttpsConnectionMiddlewareTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/HttpsConnectionMiddlewareTests.cs index 70b216e149e7..59c7222df767 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/HttpsConnectionMiddlewareTests.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/HttpsConnectionMiddlewareTests.cs @@ -632,7 +632,6 @@ public void ThrowsForCertificatesMissingServerEku(string testCertName) [InlineData(HttpProtocols.Http2)] [InlineData(HttpProtocols.Http1AndHttp2)] [OSSkipCondition(OperatingSystems.MacOSX, SkipReason = "Missing SslStream ALPN support: https://github.com/dotnet/corefx/issues/30492")] - [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 [MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10)] public async Task ListenOptionsProtolsCanBeSetAfterUseHttps(HttpProtocols httpProtocols) { From e2790a109d52eb35d4e61953046b65dc3171a042 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Fri, 31 Jul 2020 10:10:49 -0700 Subject: [PATCH 10/13] Remove debian 8 --- docs/Helix.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/Helix.md b/docs/Helix.md index 318a9ef8cba6..477574dc2c0d 100644 --- a/docs/Helix.md +++ b/docs/Helix.md @@ -19,7 +19,7 @@ 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, Debian[8,9], Redhat7, Fedora28, Arm64 (Win10, Debian9) +- Full queue matrix: Windows[7, 81, 10], Ubuntu[1604, 1804, 2004], Centos7, Debian9, Redhat7, Fedora28, Arm64 (Win10, Debian9) - The queues are defined in [Helix.Common.props](https://github.com/dotnet/aspnetcore/blob/master/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. From 0e65ed39dc21c65d50d5a45b764cf5f2654bf3ab Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Fri, 31 Jul 2020 11:56:35 -0700 Subject: [PATCH 11/13] Update Program.cs --- eng/helix/content/RunTests/Program.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/eng/helix/content/RunTests/Program.cs b/eng/helix/content/RunTests/Program.cs index f37b6362c6ff..349ab29b8a03 100644 --- a/eng/helix/content/RunTests/Program.cs +++ b/eng/helix/content/RunTests/Program.cs @@ -29,7 +29,6 @@ static async Task Main(string[] args) } runner.DisplayContents(); - runner.DisplayEnvironment(); if (keepGoing) { From c1795385363d1498d80c19aea4503dcc4810bdd7 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Fri, 31 Jul 2020 11:56:57 -0700 Subject: [PATCH 12/13] Update TestRunner.cs --- eng/helix/content/RunTests/TestRunner.cs | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/eng/helix/content/RunTests/TestRunner.cs b/eng/helix/content/RunTests/TestRunner.cs index 25833dcf3f9d..9484dff4d1e1 100644 --- a/eng/helix/content/RunTests/TestRunner.cs +++ b/eng/helix/content/RunTests/TestRunner.cs @@ -2,7 +2,6 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using System.Collections; using System.Collections.Generic; using System.IO; using System.IO.Compression; @@ -67,20 +66,6 @@ public bool SetupEnvironment() } } - public void DisplayEnvironment() - { - Console.WriteLine("KeyValue pairs from Environment.GetEnvironmentVariables():"); - foreach (DictionaryEntry pair in Environment.GetEnvironmentVariables()) - { - Console.WriteLine(pair.Key + "=" + pair.Value); - } - Console.WriteLine("KeyValue pairs from TestRunner.EnvironmentVariables"); - foreach (KeyValuePair pair in EnvironmentVariables) - { - Console.WriteLine(pair.Key + "=" + pair.Value); - } - } - public void DisplayContents(string path = "./") { try From 037f086ecd5ceea84cf158847f772a3ce8911e7a Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Fri, 31 Jul 2020 11:57:14 -0700 Subject: [PATCH 13/13] Update TestRunner.cs --- eng/helix/content/RunTests/TestRunner.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/helix/content/RunTests/TestRunner.cs b/eng/helix/content/RunTests/TestRunner.cs index 9484dff4d1e1..da4b4c228f0c 100644 --- a/eng/helix/content/RunTests/TestRunner.cs +++ b/eng/helix/content/RunTests/TestRunner.cs @@ -65,7 +65,7 @@ public bool SetupEnvironment() return false; } } - + public void DisplayContents(string path = "./") { try