diff options
| author | Jose Perez Rodriguez <joperezr@microsoft.com> | 2016-09-01 21:30:16 +0300 |
|---|---|---|
| committer | Jose Perez Rodriguez <joperezr@microsoft.com> | 2016-09-01 21:30:16 +0300 |
| commit | ea0cc674b8116a10c18c2879390c39ec08df8020 (patch) | |
| tree | 0e44817e176b10d52a3b86643acd2b5df9951cc3 /netci.groovy | |
| parent | b9a615433b4093ff3326adf6bcdf20333fcc025c (diff) | |
| parent | 022a8c2088582c3175e7aee4ad4c97c3cea58a28 (diff) | |
Merge remote-tracking branch 'upstream/master' into dev/api
Diffstat (limited to 'netci.groovy')
| -rw-r--r-- | netci.groovy | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/netci.groovy b/netci.groovy index 1e7e8b449f..232e0bcfac 100644 --- a/netci.groovy +++ b/netci.groovy @@ -240,7 +240,8 @@ def osShortName = ['Windows 10': 'win10', Utilities.standardJobSetup(newJob, project, isPR, "*/${branch}") // Add the unit test results Utilities.addXUnitDotNETResults(newJob, 'bin/tests/**/testResults.xml') - + // Add archival for the built data. + Utilities.addArchival(newJob, "msbuild.log", '', doNotFailIfNothingArchived=true, archiveOnlyIfSuccessful=false) // Set up appropriate triggers. PR on demand, otherwise nightly if (isPR) { // Set PR trigger. @@ -327,8 +328,7 @@ def osShortName = ['Windows 10': 'win10', Utilities.addPrivateGithubPRTriggerForBranch(newJob, branch, "Windows_NT ARM64 ${configurationGroup} Build and Test", "(?i).*test\\W+ARM64\\W+${os}\\W+${configurationGroup}", null, arm64Users) // Set up a per-push trigger - // Temporarily disabled until private triggers are stable - // Utilities.addGithubPushTrigger(newJob) + Utilities.addGithubPushTrigger(newJob) // Get results Utilities.addXUnitDotNETResults(newJob, 'bin/tests/testresults/**/testResults.xml') @@ -383,7 +383,7 @@ def osShortName = ['Windows 10': 'win10', archiveContents += ",bin/build.tar.gz" } // Add archival for the built data. - Utilities.addArchival(newJob, archiveContents) + Utilities.addArchival(newJob, archiveContents, '', doNotFailIfNothingArchived=true, archiveOnlyIfSuccessful=false) // Set up triggers if (isPR) { // Set PR trigger, we run Windows_NT, Ubuntu 14.04, CentOS 7.1 and OSX on every PR. @@ -445,7 +445,7 @@ def osShortName = ['Windows 10': 'win10', // Set up triggers if (isPR) { if (osName == 'LinuxARMEmulator') { - Utilities.addGithubPRTriggerForBranch(newJob, branch, "Innerloop Linux ARM Emulator ${configurationGroup} Cross Build", "(?i).*test\\W+Innerloop\\W+Linux\\W+ARM\\W+Emulator\\W+${configurationGroup}\\W+Cross\\W+Build.*") + Utilities.addGithubPRTriggerForBranch(newJob, branch, "Innerloop Linux ARM Emulator ${configurationGroup} Cross Build") } } else { |