diff options
| author | Sejong Oh <sejooh@microsoft.com> | 2016-02-19 05:00:27 -0800 |
|---|---|---|
| committer | Sejong Oh <sejooh@microsoft.com> | 2016-02-19 05:00:27 -0800 |
| commit | bfa01b4c8077737c628d0b47f993fb51225278ae (patch) | |
| tree | fdbeaff7205a14ee79ab4dfa03a4ab918266290b /netci.groovy | |
| parent | 5a49e66de150413ad8277bdbc8c2dacf0d461eae (diff) | |
| download | coreclr-bfa01b4c8077737c628d0b47f993fb51225278ae.tar.gz coreclr-bfa01b4c8077737c628d0b47f993fb51225278ae.tar.bz2 coreclr-bfa01b4c8077737c628d0b47f993fb51225278ae.zip | |
Fix PR trigger for ubuntu/osx corefx testing
Diffstat (limited to 'netci.groovy')
| -rw-r--r-- | netci.groovy | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/netci.groovy b/netci.groovy index f8d9e5249b..fd6dfe69e5 100644 --- a/netci.groovy +++ b/netci.groovy @@ -290,7 +290,8 @@ def static addTriggers(def job, def isPR, def architecture, def os, def configur case 'Ubuntu': case 'OSX': // Triggers on the non-flow jobs aren't necessary here - if (!isFlowJob) { + // Corefx testing uses a single non-flow job like Windows coreclr testing. + if (!isFlowJob && !isCorefxTesting(scenario)) { break } switch (scenario) { @@ -798,6 +799,11 @@ combinedScenarios.each { scenario -> case 'CentOS7.1': case 'RHEL7.2': case 'OpenSUSE13.2': + + // Ubuntu and OSX coreclr testing uses a different build flow. + if (os in Constants.crossList && !enableCorefxTesting) { + break; + } switch (architecture) { case 'x64': case 'x86': |