Up the timeout for gcstress arm64 jobs.
authorjashook <jashoo@microsoft.com>
Tue, 21 Feb 2017 18:05:10 +0000 (10:05 -0800)
committerjashook <jashoo@microsoft.com>
Tue, 21 Feb 2017 18:38:29 +0000 (10:38 -0800)
Commit migrated from https://github.com/dotnet/coreclr/commit/ff4806c00a6e687fe26dfea47c703982865dea32

src/coreclr/netci.groovy

index 348104c..87b0907 100755 (executable)
@@ -2025,6 +2025,7 @@ def static calculateBuildCommands(def newJob, def scenario, def branch, def isPR
                     break
                 case 'arm64':
                     assert (scenario == 'default') || (scenario == 'pri1r2r') || (scenario == 'gcstress0x3') || (scenario == 'gcstress0xc')
+                   
                     // Set time out
                     setTestJobTimeOut(newJob, scenario)
 
@@ -2033,8 +2034,12 @@ def static calculateBuildCommands(def newJob, def scenario, def branch, def isPR
                        buildCommands += "set __TestIntermediateDir=int&&build.cmd ${lowerConfiguration} ${architecture} toolset_dir C:\\ats2"
                     }
                     else {
-                       // Up the timeout for arm64 testing.
-                       Utilities.setJobTimeout(newJob, 240)
+                       if ((scenario != 'gcstress0x3') && (scenario != 'gcstress0xc'))
+                       {
+                           // Up the timeout for arm64 checked testing only.
+                           // Keep the longer timeout for gcstress.
+                           Utilities.setJobTimeout(newJob, 240)
+                       }
 
                        buildCommands += "set __TestIntermediateDir=int&&build.cmd skiptests ${lowerConfiguration} ${architecture} toolset_dir C:\\ats2"
                        // Test build and run are launched together.