diff options
| author | William Godbe <wigodbe@microsoft.com> | 2016-03-17 10:31:51 -0700 |
|---|---|---|
| committer | William Godbe <wigodbe@microsoft.com> | 2016-03-17 10:31:51 -0700 |
| commit | d3b6e6e0cc83fe3bc7dfb47d451828e9b1343a5d (patch) | |
| tree | 5042c5ff34520cac9321237476cb09c78191f4c9 /netci.groovy | |
| parent | fe87c7a2ed7af702e27ed4f199dff192aac2e41a (diff) | |
| parent | 4b2ad95564507a3b03dd75bb373cc5d8334d69e1 (diff) | |
| download | coreclr-d3b6e6e0cc83fe3bc7dfb47d451828e9b1343a5d.tar.gz coreclr-d3b6e6e0cc83fe3bc7dfb47d451828e9b1343a5d.tar.bz2 coreclr-d3b6e6e0cc83fe3bc7dfb47d451828e9b1343a5d.zip | |
Merge pull request #3790 from wtgodbe/timeout
Increase timeouts for R2R jobs to 4 hours. Also enable mistakenly disabled CentOS R2R jobs
Diffstat (limited to 'netci.groovy')
| -rw-r--r-- | netci.groovy | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/netci.groovy b/netci.groovy index c7c2923047..70b85602be 100644 --- a/netci.groovy +++ b/netci.groovy @@ -104,6 +104,10 @@ def static isCorefxTesting(def scenario) { return scenario.substring(0,corefx_prefix.length()) == corefx_prefix } +def static isR2R(def scenario) { + return (scenario == 'r2r' || scenario == 'pri1r2r') +} + def static setTestJobTimeOut(newJob, scenario) { if (isGCStressRelatedTesting(scenario)) { Utilities.setJobTimeout(newJob, 1440) @@ -114,6 +118,9 @@ def static setTestJobTimeOut(newJob, scenario) { else if (Constants.jitStressModeScenarios.containsKey(scenario)) { Utilities.setJobTimeout(newJob, 240) } + else if (isR2R(scenario)) { + Utilities.setJobTimeout(newJob, 240) + } // Non-test jobs use the default timeout value. } @@ -1110,7 +1117,7 @@ combinedScenarios.each { scenario -> } // For CentOS, we only want Checked pri1 builds. else if (os == 'CentOS7.1') { - if (scenario != 'pri1') { + if (scenario != 'pri1' && scenario != 'r2r' && scenario != 'pri1r2r') { return } if (configuration != 'Checked') { |