Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/313306
Change subject: Replace derecated logrotate with build-discarder ...................................................................... Replace derecated logrotate with build-discarder Per warnning WARNING:root:logrotate is deprecated on jenkins>=1.637, use the property build-discarder on newer jenkins instead you get when running jenkins job builder http://docs.openstack.org/infra/jenkins-job-builder/properties.html#properties.build-discarder Change-Id: Ib85b3611ccec73629bca125bc80c46e5b6ff73c2 --- M jjb/beta.yaml M jjb/castor.yaml M jjb/defaults.yaml M jjb/job-templates-browsertests.yaml M jjb/job-templates-selenium.yaml M jjb/labs.yaml M jjb/mediawiki-extensions.yaml M jjb/mediawiki.yaml M jjb/misc.yaml M jjb/mobile.yaml M jjb/php.yaml M jjb/publish.yaml M jjb/search.yaml 13 files changed, 110 insertions(+), 74 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/06/313306/1 diff --git a/jjb/beta.yaml b/jjb/beta.yaml index 38ac626..5a07235 100644 --- a/jjb/beta.yaml +++ b/jjb/beta.yaml @@ -59,8 +59,9 @@ triggers: - timed: '@hourly' - logrotate: - daysToKeep: 15 + properties: + - build-discarder: + days-to-keep: 15 # Job to deploy the Wikimedia MediaWiki configuration files # @@ -84,8 +85,9 @@ builders: - shell: /usr/local/bin/wmf-beta-mwconfig-update - logrotate: - daysToKeep: 15 + properties: + - build-discarder: + days-to-keep: 15 publishers: - beta-irc @@ -111,8 +113,9 @@ # Do not run concurrently with the downstream job block-downstream: true - logrotate: - daysToKeep: 7 + properties: + - build-discarder: + days-to-keep: 7 triggers: # Every ten minutes: @@ -149,8 +152,9 @@ - shell: | /srv/deployment/scap/scap/bin/scap sync "$JOB_NAME (build $BUILD_DISPLAY_NAME)" - logrotate: - daysToKeep: 7 + properties: + - build-discarder: + days-to-keep: 7 wrappers: - ansicolor diff --git a/jjb/castor.yaml b/jjb/castor.yaml index 9821d46..9f0b026 100644 --- a/jjb/castor.yaml +++ b/jjb/castor.yaml @@ -93,8 +93,9 @@ name: castor-save node: castor concurrent: true - logrotate: - daysToKeep: 5 + properties: + - build-discarder: + days-to-keep: 5 parameters: - string: name: TRIGGERED_SSH_CONNECTION diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml index 2e1f966..0048f44 100644 --- a/jjb/defaults.yaml +++ b/jjb/defaults.yaml @@ -5,8 +5,9 @@ project-type: freestyle - logrotate: - daysToKeep: 30 + properties: + - build-discarder: + days-to-keep: 30 wrappers: - timeout: @@ -24,8 +25,9 @@ project-type: freestyle - logrotate: - daysToKeep: 30 + properties: + - build-discarder: + days-to-keep: 30 scm: - git-remoteonly-zuul @@ -47,8 +49,9 @@ project-type: freestyle - logrotate: - daysToKeep: 30 + properties: + - build-discarder: + days-to-keep: 30 scm: - git: @@ -78,8 +81,9 @@ project-type: freestyle - logrotate: - daysToKeep: 30 + properties: + - build-discarder: + days-to-keep: 30 scm: - git: @@ -109,8 +113,9 @@ project-type: freestyle - logrotate: - daysToKeep: 30 + properties: + - build-discarder: + days-to-keep: 30 scm: - git: diff --git a/jjb/job-templates-browsertests.yaml b/jjb/job-templates-browsertests.yaml index 62280e0..a8c2b9c 100644 --- a/jjb/job-templates-browsertests.yaml +++ b/jjb/job-templates-browsertests.yaml @@ -9,8 +9,9 @@ cucumber_tags: '' version: '' - logrotate: - daysToKeep: 31 # ~ 2 * 2 weeks sprints + properties: + - build-discarder: + days-to-keep: 31 # ~ 2 * 2 weeks sprints scm: - git: diff --git a/jjb/job-templates-selenium.yaml b/jjb/job-templates-selenium.yaml index ef39237..d0f504e 100644 --- a/jjb/job-templates-selenium.yaml +++ b/jjb/job-templates-selenium.yaml @@ -27,8 +27,9 @@ node: contintLabsSlave && UbuntuTrusty repository_host: 'gerrit.wikimedia.org/r' - logrotate: - daysToKeep: 31 # ~ 2 * 2 weeks sprints + properties: + - build-discarder: + days-to-keep: 31 # ~ 2 * 2 weeks sprints scm: - git: diff --git a/jjb/labs.yaml b/jjb/labs.yaml index 5984f37..8d059eb 100644 --- a/jjb/labs.yaml +++ b/jjb/labs.yaml @@ -9,8 +9,9 @@ name: 'labs-tools-wikibugs2-autopull' node: contintLabsSlave concurrent: false - logrotate: - daysToKeep: 15 + properties: + - build-discarder: + days-to-keep: 15 builders: - shell: curl --fail --silent --show-error --max-time 10 https://tools.wmflabs.org/wikibugs/pull.php diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml index 6373c3b..398e202 100644 --- a/jjb/mediawiki-extensions.yaml +++ b/jjb/mediawiki-extensions.yaml @@ -165,9 +165,10 @@ - localhost-cleanup - mw-teardown-mysql - archive-log-dir - logrotate: - daysToKeep: 15 - artifactDaysToKeep: 3 + properties: + - build-discarder: + days-to-keep: 15 + artifact-days-to-keep: 3 # Generic mw-selenium job for extensions. - job: @@ -186,17 +187,19 @@ - localhost-cleanup - mw-teardown-mysql - archive-log-dir - logrotate: - daysToKeep: 15 - artifactDaysToKeep: 3 + properties: + - build-discarder: + days-to-keep: 15 + artifact-days-to-keep: 3 - job-template: name: 'mwext-{name}-whitespaces' node: contintLabsSlave && UbuntuTrusty defaults: use-remoteonly-zuul concurrent: true - logrotate: - daysToKeep: 15 + properties: + - build-discarder: + days-to-keep: 15 triggers: - zuul builders: diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml index 78bd892..cc143d5 100644 --- a/jjb/mediawiki.yaml +++ b/jjb/mediawiki.yaml @@ -36,8 +36,9 @@ concurrent: true triggers: - zuul - logrotate: - daysToKeep: 15 + properties: + - build-discarder: + days-to-keep: 15 builders: - castor-load - zuul-cloner: @@ -56,8 +57,9 @@ node: contintLabsSlave && UbuntuTrusty defaults: use-remote-zuul-no-submodules concurrent: true - logrotate: - daysToKeep: 15 + properties: + - build-discarder: + days-to-keep: 15 triggers: - zuul builders: @@ -68,8 +70,9 @@ node: contintLabsSlave && UbuntuTrusty defaults: use-remote-zuul-no-submodules concurrent: false - logrotate: - daysToKeep: 15 + properties: + - build-discarder: + days-to-keep: 15 triggers: - zuul builders: @@ -229,8 +232,9 @@ # matching the expression. node: 'contintLabsSlave && phpflavor-{phpflavor}' concurrent: true - logrotate: - daysToKeep: 15 + properties: + - build-discarder: + days-to-keep: 15 properties: - throttle-one-per-node @@ -263,8 +267,9 @@ name: 'mediawiki-extensions-qunit-jessie' node: 'ci-jessie-wikimedia' concurrent: true - logrotate: - daysToKeep: 15 + properties: + - build-discarder: + days-to-keep: 15 triggers: - zuul builders: @@ -437,8 +442,9 @@ name: 'mediawiki-core-phpcs-trusty' node: ci-trusty-wikimedia concurrent: true - logrotate: - daysToKeep: 15 + properties: + - build-discarder: + days-to-keep: 15 triggers: - zuul builders: diff --git a/jjb/misc.yaml b/jjb/misc.yaml index 622d539..e07d7c5 100644 --- a/jjb/misc.yaml +++ b/jjb/misc.yaml @@ -194,8 +194,9 @@ name: 'performance-webpagetest-wmf' node: contintLabsSlave && UbuntuTrusty defaults: global - logrotate: - daysToKeep: 60 + properties: + - build-discarder: + days-to-keep: 60 concurrent: false scm: - git: @@ -257,8 +258,9 @@ name: 'performance-webpagetest-wpt-org' node: contintLabsSlave && UbuntuTrusty defaults: global - logrotate: - daysToKeep: 60 + properties: + - build-discarder: + days-to-keep: 60 concurrent: false scm: - git: diff --git a/jjb/mobile.yaml b/jjb/mobile.yaml index 9b5b44c..9fe9085 100644 --- a/jjb/mobile.yaml +++ b/jjb/mobile.yaml @@ -43,8 +43,9 @@ concurrent: true triggers: - zuul - logrotate: - daysToKeep: 15 + properties: + - build-discarder: + days-to-keep: 15 wrappers: - timeout: timeout: 30 diff --git a/jjb/php.yaml b/jjb/php.yaml index 605884a..c6c8ff9 100644 --- a/jjb/php.yaml +++ b/jjb/php.yaml @@ -42,8 +42,9 @@ - zuul builders: - composer-validate-package - logrotate: - daysToKeep: 15 + properties: + - build-discarder: + days-to-keep: 15 # Job for anything with a composer.json, but *isn't* going to be # published on packagist.org. @@ -58,8 +59,9 @@ builders: - composer-validate: dir: '.' - logrotate: - daysToKeep: 15 + properties: + - build-discarder: + days-to-keep: 15 # Generic job that runs "composer update" and "composer test" # Runs on Ubuntu Precise that ships Zend 5.3. @@ -77,8 +79,9 @@ - composer-update: dir: '.' - composer-test - logrotate: - daysToKeep: 15 + properties: + - build-discarder: + days-to-keep: 15 # Run composer update and composer test # Intended for libraries that are published as composer packages @@ -110,8 +113,9 @@ node: contintLabsSlave && phpflavor-{phpflavor} defaults: use-remote-zuul-shallow-clone concurrent: true - logrotate: - daysToKeep: 15 + properties: + - build-discarder: + days-to-keep: 15 triggers: - zuul builders: @@ -131,8 +135,9 @@ node: ci-{image}-wikimedia defaults: use-remote-zuul-shallow-clone concurrent: true - logrotate: - daysToKeep: 15 + properties: + - build-discarder: + days-to-keep: 15 triggers: - zuul builders: diff --git a/jjb/publish.yaml b/jjb/publish.yaml index 3ed6c7f..d3cb591 100644 --- a/jjb/publish.yaml +++ b/jjb/publish.yaml @@ -131,5 +131,6 @@ # postbuildscript is ALWAYS run. onsuccess: False onfailure: False - logrotate: - daysToKeep: 15 + properties: + - build-discarder: + days-to-keep: 15 diff --git a/jjb/search.yaml b/jjb/search.yaml index f64d3ed..34ab72d 100644 --- a/jjb/search.yaml +++ b/jjb/search.yaml @@ -6,8 +6,9 @@ concurrent: true triggers: - zuul - logrotate: - daysToKeep: 15 + properties: + - build-discarder: + days-to-keep: 15 scm: - git-remoteonly-zuul wrappers: @@ -27,8 +28,9 @@ concurrent: true triggers: - zuul - logrotate: - daysToKeep: 15 + properties: + - build-discarder: + days-to-keep: 15 scm: - git-remoteonly-zuul wrappers: @@ -48,8 +50,9 @@ concurrent: true triggers: - zuul - logrotate: - daysToKeep: 15 + properties: + - build-discarder: + days-to-keep: 15 scm: - git-remoteonly-zuul wrappers: @@ -79,8 +82,9 @@ concurrent: true triggers: - zuul - logrotate: - daysToKeep: 15 + properties: + - build-discarder: + days-to-keep: 15 scm: - git-remoteonly-zuul wrappers: @@ -105,8 +109,9 @@ concurrent: true triggers: - zuul - logrotate: - daysToKeep: 15 + properties: + - build-discarder: + days-to-keep: 15 scm: - git-remoteonly-zuul wrappers: -- To view, visit https://gerrit.wikimedia.org/r/313306 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib85b3611ccec73629bca125bc80c46e5b6ff73c2 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Paladox <thomasmulhall...@yahoo.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
