diff options
author | Bruce Forstall <brucefo@microsoft.com> | 2019-04-18 15:45:05 -0700 |
---|---|---|
committer | Bruce Forstall <brucefo@microsoft.com> | 2019-04-18 15:45:05 -0700 |
commit | 8d4fccb658f5765f6ab3c691736d06fcb672cc5c (patch) | |
tree | 471d6031d6bd65d6ead833ece758f7c70f878a26 /netci.groovy | |
parent | f360bbc0cf893bcd612516563145729743d3af2b (diff) | |
download | coreclr-8d4fccb658f5765f6ab3c691736d06fcb672cc5c.tar.gz coreclr-8d4fccb658f5765f6ab3c691736d06fcb672cc5c.tar.bz2 coreclr-8d4fccb658f5765f6ab3c691736d06fcb672cc5c.zip |
Reduce the number of Linux arm32 periodic jobs triggered
Only the corefx jobs are left. The rest should be done in AzDO,
and scheduling both AzDO and Jenkins is causing too much work
for the few machines we have.
Diffstat (limited to 'netci.groovy')
-rwxr-xr-x | netci.groovy | 36 |
1 files changed, 31 insertions, 5 deletions
diff --git a/netci.groovy b/netci.groovy index 4a765c8c35..22ee7ffed5 100755 --- a/netci.groovy +++ b/netci.groovy @@ -1267,8 +1267,14 @@ def static addNonPRTriggers(def job, def branch, def isPR, def architecture, def // Check scenario. switch (scenario) { case 'crossgen_comparison': - if (isFlowJob && ((os == 'Ubuntu' && architecture == 'arm') || (os == 'Ubuntu16.04' && architecture == 'arm64')) && (configuration == 'Checked' || configuration == 'Release')) { - addPeriodicTriggerHelper(job, '@daily') + if (isFlowJob && (configuration == 'Checked' || configuration == 'Release')) { + if (os == 'Ubuntu' && architecture == 'arm') { + // Not enough Linux/arm32 hardware for this. + // addPeriodicTriggerHelper(job, '@daily') + } + if (os == 'Ubuntu16.04' && architecture == 'arm64') { + addPeriodicTriggerHelper(job, '@daily') + } } break @@ -1316,7 +1322,9 @@ def static addNonPRTriggers(def job, def branch, def isPR, def architecture, def if (isFlowJob) { // Currently no push triggers, with limited arm Linux hardware. // TODO: If we have enough machine capacity, add some arm Linux push triggers. - addPeriodicTriggerHelper(job, '@daily') + + // Duplicated by AzDO + // addPeriodicTriggerHelper(job, '@daily') } } break @@ -1353,7 +1361,10 @@ def static addNonPRTriggers(def job, def branch, def isPR, def architecture, def // arm r2r jobs should only run weekly. else if (architecture == 'arm') { if (isFlowJob) { - addPeriodicTriggerHelper(job, '@weekly') + // Linux arm32 done in AzDO + if (os == 'Windows_NT') { + addPeriodicTriggerHelper(job, '@weekly') + } } } // arm64 r2r jobs should only run weekly. @@ -1402,7 +1413,10 @@ def static addNonPRTriggers(def job, def branch, def isPR, def architecture, def } else if (architecture == 'arm') { if (isFlowJob) { - addPeriodicTriggerHelper(job, '@weekly') + // Linux arm32 duplicated by AzDO + if (os == 'Windows_NT') { + addPeriodicTriggerHelper(job, '@weekly') + } } } else if (architecture == 'arm64') { @@ -1512,6 +1526,10 @@ def static addNonPRTriggers(def job, def branch, def isPR, def architecture, def if (os in bidailyCrossList) { break } + if ((os == 'Ubuntu') && (architecture == 'arm') && !isCoreFxScenario(scenario)) { + // Linux arm32 duplicated by AzDO + break + } // ARM corefx testing uses non-flow jobs to provide the configuration-specific // build for the flow job. We don't need cron jobs for these. Note that the // Windows ARM jobs depend on a Windows "build only" job that exits the trigger @@ -1546,6 +1564,10 @@ def static addNonPRTriggers(def job, def branch, def isPR, def architecture, def if (os in bidailyCrossList) { break } + if ((os == 'Ubuntu') && (architecture == 'arm')) { + // Linux arm32 duplicated by AzDO + break + } addPeriodicTriggerHelper(job, '@weekly') break case 'gcstress0xc': @@ -1565,6 +1587,10 @@ def static addNonPRTriggers(def job, def branch, def isPR, def architecture, def if (os in bidailyCrossList) { break } + if ((os == 'Ubuntu') && (architecture == 'arm')) { + // Linux arm32 duplicated by AzDO + break + } addPeriodicTriggerHelper(job, '@weekly') break |