Kaynağa Gözat

Enable helix retry for a small set of tests (#37137)

Hao Kung 4 yıl önce
ebeveyn
işleme
7cc5ad9331

+ 5 - 0
eng/helix/helix.proj

@@ -24,6 +24,7 @@
     <IsExternal>true</IsExternal>
     <MaxRetryCount Condition="'$(MaxRetryCount)' == ''">2</MaxRetryCount>
     <HelixAccessToken Condition="'$(_UseHelixOpenQueues)' != 'true'">$(HelixApiAccessToken)</HelixAccessToken>
+    <HelixTestConfigurationFilePath>$(RepoRoot)eng/test-configuration.json</HelixTestConfigurationFilePath>
     <IncludeDotNetCli>true</IncludeDotNetCli>
     <DotNetCliPackageType>sdk</DotNetCliPackageType>
     <DotNetCliVersion>$(NETCoreSdkVersion)</DotNetCliVersion>
@@ -74,6 +75,10 @@
     <HelixProperties Condition="'$(RunQuarantinedTests)' != 'true'" Include="runType" Value="unquarantined" />
   </ItemGroup>
 
+  <ItemGroup Condition="Exists('$(HelixTestConfigurationFilePath)')">
+    <HelixCorrelationPayload Include="$(HelixTestConfigurationFilePath)" AsArchive="false" />
+  </ItemGroup>
+  
   <Target Name="IncludeAspNetRuntime" BeforeTargets="Gather"
     Condition="'$(DoNotRequireSharedFxHelix)' != 'true' OR
     EXISTS('$(RepoRoot)artifacts\packages\$(Configuration)\Shipping\Microsoft.AspNetCore.App.Runtime.$(TargetRuntimeIdentifier).$(SharedFxVersion).nupkg')">

+ 16 - 0
eng/test-configuration.json

@@ -0,0 +1,16 @@
+{
+  "version" : 1,
+  "defaultOnFailure": "fail",
+  "localRerunCount" : 3,
+  "retryOnRules": [
+    {"testName": {"contains": "AppOfflineDroppedWhileSiteStarting_SiteShutsDown_InProcess"}},
+    {"testName": {"contains": "CheckFrebDisconnect"}},
+    {"testName": {"contains": "CheckStdoutWithLargeWrites"}},
+    {"testName": {"contains": "ServerShutsDownWhenMainExitsStress" }},
+    {"failureMessage": "network disconnected" }
+  ],
+  "failOnRules": [
+  ],
+  "quarantineRules": [
+  ]
+}

+ 0 - 1
src/Servers/IIS/IIS/test/Common.FunctionalTests/FrebTests.cs

@@ -99,7 +99,6 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests
         [MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H2, SkipReason = "Shutdown hangs https://github.com/dotnet/aspnetcore/issues/25107")]
         [Repeat(10)]
         [RequiresIIS(IISCapability.FailedRequestTracingModule)]
-        [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/29428")]
         public async Task CheckFrebDisconnect()
         {
             var result = await SetupFrebApp();

+ 0 - 2
src/Servers/IIS/IIS/test/Common.FunctionalTests/StartupTests.cs

@@ -997,7 +997,6 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests
 
 
         [ConditionalTheory]
-        [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/27178")]
         [MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H2, SkipReason = "Shutdown hangs https://github.com/dotnet/aspnetcore/issues/25107")]
         [InlineData("CheckLargeStdErrWrites")]
         [InlineData("CheckLargeStdOutWrites")]
@@ -1024,7 +1023,6 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests
         }
 
         [ConditionalTheory]
-        [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/27858")]
         [MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H2, SkipReason = "Shutdown hangs https://github.com/dotnet/aspnetcore/issues/25107")]
         [InlineData("CheckLargeStdOutWrites")]
         [InlineData("CheckOversizedStdOutWrites")]