diff options
| author | Alexander Köplinger <alex.koeplinger@outlook.com> | 2019-07-31 14:32:06 +0300 |
|---|---|---|
| committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2019-07-31 14:32:06 +0300 |
| commit | 471421023c27752f02ce4728778d6ff814ce362f (patch) | |
| tree | 1fc4de01c2531c6f52f8418c5da9dbb2477b1415 /scripts | |
| parent | bd0c46a8422dc5bbfb6a41fcf913d8db8d817632 (diff) | |
[ci] Handle master build purging in a separate cleanup job
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/ci/pipeline/osx-package.groovy | 6 | ||||
| -rw-r--r-- | scripts/ci/pipeline/sdks-archive.groovy | 6 |
2 files changed, 2 insertions, 10 deletions
diff --git a/scripts/ci/pipeline/osx-package.groovy b/scripts/ci/pipeline/osx-package.groovy index c0e2dc184f2..c6cbfec3544 100644 --- a/scripts/ci/pipeline/osx-package.groovy +++ b/scripts/ci/pipeline/osx-package.groovy @@ -11,8 +11,7 @@ utils = null if (monoBranch == 'master') { properties([ /* compressBuildLog() */ // compression is incompatible with JEP-210 right now - pipelineTriggers([cron('0 3 * * *')]), - buildDiscarder(logRotator(numToKeepStr: '1')) // delete skipped builds + pipelineTriggers([cron('0 3 * * *')]) ]) // multi-branch pipelines still get triggered for each commit, skip these builds on master by checking whether this build was timer-triggered @@ -20,9 +19,6 @@ if (monoBranch == 'master') { echo "Skipping per-commit build on master." return } - - // make sure this build isn't deleted by logRotator - currentBuild.setKeepLog(true) } try { diff --git a/scripts/ci/pipeline/sdks-archive.groovy b/scripts/ci/pipeline/sdks-archive.groovy index fbf6410b6cd..997a0cfdc1b 100644 --- a/scripts/ci/pipeline/sdks-archive.groovy +++ b/scripts/ci/pipeline/sdks-archive.groovy @@ -6,8 +6,7 @@ azureContainerName = (xcode11 ? "mono-sdks-xcode11" : "mono-sdks") if (monoBranch == 'master') { properties([ /* compressBuildLog() */ // compression is incompatible with JEP-210 right now - pipelineTriggers([cron('0 3 * * *')]), - buildDiscarder(logRotator(numToKeepStr: '1')) // delete skipped builds + pipelineTriggers([cron('0 3 * * *')]) ]) // multi-branch pipelines still get triggered for each commit, skip these builds on master by checking whether this build was timer-triggered @@ -15,9 +14,6 @@ if (monoBranch == 'master') { echo "Skipping per-commit build on master." return } - - // make sure this build isn't deleted by logRotator - currentBuild.setKeepLog(true) } parallel ( |