Set MaxRetryCount to 4 for both Windows and non-Windows jobs (dotnet/corefx#34792)

Commit migrated from https://github.com/dotnet/corefx/commit/fd21fbc661a26eab435a9925fc243616a1798362

diff --git a/eng/sendtohelix.proj b/eng/sendtohelix.proj
index 885a5c0..b6821aa 100644 (file)
--- a/eng/sendtohelix.proj
+++ b/eng/sendtohelix.proj
@@ -28,6 +28,8 @@
     <!-- This property is used to show the tests results in Azure Dev Ops. By setting this property the
     test run name will be displayed as $(BuildConfiguration)-$(HelixTargetQueue) -->
     <TestRunNamePrefix>$(BuildConfiguration)-</TestRunNamePrefix>
+
+    <MaxRetryCount Condition="'$(MaxRetryCount)' == ''">4</MaxRetryCount>
   </PropertyGroup>
 
   <!-- If mission control reports a test failure then fail the build whenever helix wait runs. -->
@@ -50,12 +52,6 @@
     <HelixType Condition="'$(TargetGroup)' == 'uapaot' AND '$(OfficialBuildId)' != ''">test/functional/ilc/</HelixType>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(MaxRetryCount)' == ''">
-    <!-- In Windows we need a higher value due to some flakyness in Nano. Can remove when helix provides new containers model -->
-    <MaxRetryCount Condition="'$(TargetsWindows)' == 'true'">9</MaxRetryCount>
-    <MaxRetryCount Condition="'$(TargetsWindows)' != 'true'">1</MaxRetryCount>
-  </PropertyGroup>
-
   <PropertyGroup Condition="'$(HelixCommand)' == ''">
     <!-- For windows we need to use call, since the command is going to be called from a bat script created by Helix
     and we exit /b at the end of RunTests.cmd, Helix runs some other commands after ours within the bat script,