From: Alfredo Deza <adeza@redhat.com>
Date: Tue, 13 Mar 2018 21:00:31 +0000 (-0400)
Subject: migrate from logrotate to build-discarder
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dac4980e433f607dadea68b371e4a390839eefc2;p=ceph-build.git

migrate from logrotate to build-discarder

build-discarder has been deprecated for a while and it is pervasive in
all jobs. Jenkins will stop supporting this as well as Jenkins Job
Builder

Signed-off-by: Alfredo Deza <adeza@redhat.com>
---

diff --git a/calamari-clients-setup/config/definitions/calamari-clients-setup.yml b/calamari-clients-setup/config/definitions/calamari-clients-setup.yml
index 6f7326911..7fb6d67a8 100644
--- a/calamari-clients-setup/config/definitions/calamari-clients-setup.yml
+++ b/calamari-clients-setup/config/definitions/calamari-clients-setup.yml
@@ -5,15 +5,15 @@
     # FIXME: unpin when this gets ported over
     node: small && centos7
     display-name: 'calamari-clients-setup'
-    logrotate:
-      daysToKeep: -1
-      numToKeep: 25
-      artifactDaysToKeep: -1
-      artifactNumToKeep: -1
     block-downstream: false
     block-upstream: false
     concurrent: true
     properties:
+      - build-discarder:
+          days-to-keep: -1
+          num-to-keep: 25
+          artifact-days-to-keep: -1
+          artifact-num-to-keep: -1
       - github:
           url: https://github.com/ceph/calamari-clients
 
diff --git a/calamari-clients/config/definitions/calamari-clients.yml b/calamari-clients/config/definitions/calamari-clients.yml
index 33295041d..be4b74380 100644
--- a/calamari-clients/config/definitions/calamari-clients.yml
+++ b/calamari-clients/config/definitions/calamari-clients.yml
@@ -5,14 +5,14 @@
     defaults: global
     concurrent: true
     display-name: 'calamari-clients'
-    logrotate:
-      daysToKeep: -1
-      numToKeep: 25
-      artifactDaysToKeep: 25
-      artifactNumToKeep: 25
     block-downstream: false
     block-upstream: false
     properties:
+      - build-discarder:
+          days-to-keep: -1
+          num-to-keep: 25
+          artifact-days-to-keep: 25
+          artifact-num-to-keep: 25
       - github:
           url: https://github.com/ceph/calamari-clients
 
diff --git a/ceph-ansible-docs-prs/config/definitions/ceph-ansible-docs-prs.yml b/ceph-ansible-docs-prs/config/definitions/ceph-ansible-docs-prs.yml
index e3ef8408d..d5a1cd575 100644
--- a/ceph-ansible-docs-prs/config/definitions/ceph-ansible-docs-prs.yml
+++ b/ceph-ansible-docs-prs/config/definitions/ceph-ansible-docs-prs.yml
@@ -9,13 +9,13 @@
     block-upstream: false
     retry-count: 3
     properties:
+      - build-discarder:
+          days-to-keep: -1
+          num-to-keep: 10
+          artifact-days-to-keep: -1
+          artifact-num-to-keep: -1
       - github:
           url: https://github.com/ceph/ceph-ansible
-    logrotate:
-      daysToKeep: -1
-      numToKeep: 10
-      artifactDaysToKeep: -1
-      artifactNumToKeep: -1
 
     parameters:
       - string:
diff --git a/ceph-ansible-docs/config/definitions/ceph-ansible-docs.yml b/ceph-ansible-docs/config/definitions/ceph-ansible-docs.yml
index a8f048db4..5d64ab2ed 100644
--- a/ceph-ansible-docs/config/definitions/ceph-ansible-docs.yml
+++ b/ceph-ansible-docs/config/definitions/ceph-ansible-docs.yml
@@ -9,13 +9,13 @@
     block-upstream: false
     retry-count: 3
     properties:
+      - build-discarder:
+          days-to-keep: -1
+          num-to-keep: 10
+          artifact-days-to-keep: -1
+          artifact-num-to-keep: -1
       - github:
           url: https://github.com/ceph/ceph-ansible
-    logrotate:
-      daysToKeep: -1
-      numToKeep: 10
-      artifactDaysToKeep: -1
-      artifactNumToKeep: -1
 
     triggers:
       - github
diff --git a/ceph-ansible-galaxy/config/definitions/ceph-ansible-galaxy.yml b/ceph-ansible-galaxy/config/definitions/ceph-ansible-galaxy.yml
index 289c47e6a..b757370bc 100644
--- a/ceph-ansible-galaxy/config/definitions/ceph-ansible-galaxy.yml
+++ b/ceph-ansible-galaxy/config/definitions/ceph-ansible-galaxy.yml
@@ -9,13 +9,13 @@
     block-upstream: false
     retry-count: 3
     properties:
+      - build-discarder:
+          days-to-keep: -1
+          num-to-keep: -1
+          artifact-days-to-keep: -1
+          artifact-num-to-keep: -1
       - github:
           url: https://github.com/ceph/ceph-ansible
-    logrotate:
-      daysToKeep: -1
-      numToKeep: -1
-      artifactDaysToKeep: -1
-      artifactNumToKeep: -1
 
     triggers:
       - github
diff --git a/ceph-ansible-nightly/config/definitions/ceph-ansible-nightly.yml b/ceph-ansible-nightly/config/definitions/ceph-ansible-nightly.yml
index e6644f8c1..a12b54705 100644
--- a/ceph-ansible-nightly/config/definitions/ceph-ansible-nightly.yml
+++ b/ceph-ansible-nightly/config/definitions/ceph-ansible-nightly.yml
@@ -105,11 +105,11 @@
     properties:
       - github:
           url: https://github.com/ceph/ceph-ansible
-    logrotate:
-      daysToKeep: 90
-      numToKeep: -1
-      artifactDaysToKeep: -1
-      artifactNumToKeep: -1
+      - build-discarder:
+          days-to-keep: 90
+          num-to-keep: -1
+          artifact-days-to-keep: -1
+          artifact-num-to-keep: -1
 
     parameters:
       - string:
diff --git a/ceph-ansible-pr-syntax-check/config/definitions/ceph-ansible-pr-syntax-check.yml b/ceph-ansible-pr-syntax-check/config/definitions/ceph-ansible-pr-syntax-check.yml
index a5b411302..df438ef32 100644
--- a/ceph-ansible-pr-syntax-check/config/definitions/ceph-ansible-pr-syntax-check.yml
+++ b/ceph-ansible-pr-syntax-check/config/definitions/ceph-ansible-pr-syntax-check.yml
@@ -24,13 +24,13 @@
     block-upstream: false
     retry-count: 3
     properties:
+      - build-discarder:
+          days-to-keep: 15
+          num-to-keep: 30
+          artifact-days-to-keep: -1
+          artifact-num-to-keep: -1
       - github:
           url: https://github.com/ceph/ceph-ansible
-    logrotate:
-      daysToKeep: 15
-      numToKeep: 30
-      artifactDaysToKeep: -1
-      artifactNumToKeep: -1
 
     parameters:
       - string:
diff --git a/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml b/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml
index 12553795b..2cf8cfdaf 100644
--- a/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml
+++ b/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml
@@ -107,11 +107,11 @@
     properties:
       - github:
           url: https://github.com/ceph/ceph-ansible
-    logrotate:
-      daysToKeep: 90
-      numToKeep: -1
-      artifactDaysToKeep: -1
-      artifactNumToKeep: -1
+      - build-discarder:
+          days-to-keep: 90
+          num-to-keep: -1
+          artifact-days-to-keep: -1
+          artifact-num-to-keep: -1
 
     parameters:
       - string:
@@ -186,11 +186,11 @@
     properties:
       - github:
           url: https://github.com/ceph/ceph-ansible
-    logrotate:
-      daysToKeep: 90
-      numToKeep: -1
-      artifactDaysToKeep: -1
-      artifactNumToKeep: -1
+      - build-discarder:
+        days-to-keep: 90
+        num-to-keep: -1
+        artifact-days-to-keep: -1
+        artifact-num-to-keep: -1
 
     parameters:
       - string:
@@ -265,11 +265,11 @@
     properties:
       - github:
           url: https://github.com/ceph/ceph-ansible
-    logrotate:
-      daysToKeep: 90
-      numToKeep: -1
-      artifactDaysToKeep: -1
-      artifactNumToKeep: -1
+      - build-discarder:
+          days-to-keep: 90
+          num-to-keep: -1
+          artifact-days-to-keep: -1
+          artifact-num-to-keep: -1
 
     parameters:
       - string:
diff --git a/ceph-ansible-rpm/config/definitions/ceph-ansible-rpm.yml b/ceph-ansible-rpm/config/definitions/ceph-ansible-rpm.yml
index 81eb7d72e..8c1c479bc 100644
--- a/ceph-ansible-rpm/config/definitions/ceph-ansible-rpm.yml
+++ b/ceph-ansible-rpm/config/definitions/ceph-ansible-rpm.yml
@@ -12,14 +12,14 @@
     block-upstream: false
     retry-count: 3
     properties:
+      - build-discarder:
+          days-to-keep: 1
+          num-to-keep: 10
+          artifact-days-to-keep: -1
+          artifact-num-to-keep: -1
       - github:
           url: https://github.com/ceph/ceph-ansible
     discard-old-builds: true
-    logrotate:
-      daysToKeep: 1
-      numToKeep: 10
-      artifactDaysToKeep: -1
-      artifactNumToKeep: -1
 
     triggers:
       - github
diff --git a/ceph-ansible-scenario/config/definitions/ceph-ansible-scenario.yml b/ceph-ansible-scenario/config/definitions/ceph-ansible-scenario.yml
index 639d7d8ec..1bbc4b34f 100644
--- a/ceph-ansible-scenario/config/definitions/ceph-ansible-scenario.yml
+++ b/ceph-ansible-scenario/config/definitions/ceph-ansible-scenario.yml
@@ -10,13 +10,13 @@
     block-upstream: false
     retry-count: 3
     properties:
+      - build-discarder:
+          days-to-keep: 15
+          num-to-keep: 30
+          artifact-days-to-keep: -1
+          artifact-num-to-keep: -1
       - github:
           url: https://github.com/ceph/ceph-ansible
-    logrotate:
-      daysToKeep: 15
-      numToKeep: 30
-      artifactDaysToKeep: -1
-      artifactNumToKeep: -1
 
     parameters:
       - string:
diff --git a/ceph-build-pull-requests/config/definitions/ceph-build-pull-requests.yml b/ceph-build-pull-requests/config/definitions/ceph-build-pull-requests.yml
index 3401e8288..e4c6a1a79 100644
--- a/ceph-build-pull-requests/config/definitions/ceph-build-pull-requests.yml
+++ b/ceph-build-pull-requests/config/definitions/ceph-build-pull-requests.yml
@@ -10,13 +10,13 @@
     block-upstream: false
     retry-count: 3
     properties:
+      - build-discarder:
+          days-to-keep: 15
+          num-to-keep: 30
+          artifact-days-to-keep: -1
+          artifact-num-to-keep: -1
       - github:
           url: https://github.com/ceph/ceph-build
-    logrotate:
-      daysToKeep: 15
-      numToKeep: 30
-      artifactDaysToKeep: -1
-      artifactNumToKeep: -1
 
     parameters:
       - string:
diff --git a/ceph-container-build-push-imgs/config/definitions/ceph-container-build-push-imgs.yml b/ceph-container-build-push-imgs/config/definitions/ceph-container-build-push-imgs.yml
index a42116f55..c31e07706 100644
--- a/ceph-container-build-push-imgs/config/definitions/ceph-container-build-push-imgs.yml
+++ b/ceph-container-build-push-imgs/config/definitions/ceph-container-build-push-imgs.yml
@@ -9,13 +9,13 @@
     block-upstream: false
     retry-count: 3
     properties:
+      - build-discarder:
+          days-to-keep: -1
+          num-to-keep: -1
+          artifact-days-to-keep: -1
+          artifact-num-to-keep: -1
       - github:
           url: https://github.com/ceph/ceph-container
-    logrotate:
-      daysToKeep: -1
-      numToKeep: -1
-      artifactDaysToKeep: -1
-      artifactNumToKeep: -1
 
     triggers:
       - github
diff --git a/ceph-container-flake8/config/definitions/ceph-container-flake8.yml b/ceph-container-flake8/config/definitions/ceph-container-flake8.yml
index f9f1c62a3..99b638c45 100644
--- a/ceph-container-flake8/config/definitions/ceph-container-flake8.yml
+++ b/ceph-container-flake8/config/definitions/ceph-container-flake8.yml
@@ -18,13 +18,13 @@
     defaults: global
     display-name: 'ceph-container-flake8'
     properties:
+      - build-discarder:
+          days-to-keep: 15
+          num-to-keep: 30
+          artifact-days-to-keep: -1
+          artifact-num-to-keep: -1
       - github:
           url: https://github.com/ceph/ceph-container/
-    logrotate:
-      daysToKeep: 15
-      numToKeep: 30
-      artifactDaysToKeep: -1
-      artifactNumToKeep: -1
 
     parameters:
       - string:
diff --git a/ceph-container-lint/config/definitions/ceph-container-lint.yml b/ceph-container-lint/config/definitions/ceph-container-lint.yml
index e353027ee..b71e7985b 100644
--- a/ceph-container-lint/config/definitions/ceph-container-lint.yml
+++ b/ceph-container-lint/config/definitions/ceph-container-lint.yml
@@ -18,13 +18,13 @@
     defaults: global
     display-name: 'ceph-container-lint'
     properties:
+      - build-discarder:
+          days-to-keep: 15
+          num-to-keep: 30
+          artifact-days-to-keep: -1
+          artifact-num-to-keep: -1
       - github:
           url: https://github.com/ceph/ceph-container/
-    logrotate:
-      daysToKeep: 15
-      numToKeep: 30
-      artifactDaysToKeep: -1
-      artifactNumToKeep: -1
 
     parameters:
       - string:
diff --git a/ceph-container-nighlity/config/definitions/ceph-container-nightly.yml b/ceph-container-nighlity/config/definitions/ceph-container-nightly.yml
index a5cf82f0f..75686e9a8 100644
--- a/ceph-container-nighlity/config/definitions/ceph-container-nightly.yml
+++ b/ceph-container-nighlity/config/definitions/ceph-container-nightly.yml
@@ -29,11 +29,11 @@
     properties:
       - github:
           url: https://github.com/ceph/ceph-container
-    logrotate:
-      daysToKeep: -1
-      numToKeep: -1
-      artifactDaysToKeep: -1
-      artifactNumToKeep: -1
+      - build-discarder:
+          days-to-keep: -1
+          num-to-keep: -1
+          artifact-days-to-keep: -1
+          artifact-num-to-keep: -1
 
     parameters:
       - string:
diff --git a/ceph-container-prs/config/definitions/ceph-container-prs.yml b/ceph-container-prs/config/definitions/ceph-container-prs.yml
index b9781bfda..9043e0363 100644
--- a/ceph-container-prs/config/definitions/ceph-container-prs.yml
+++ b/ceph-container-prs/config/definitions/ceph-container-prs.yml
@@ -31,11 +31,11 @@
     properties:
       - github:
           url: https://github.com/ceph/ceph-container
-    logrotate:
-      daysToKeep: 15
-      numToKeep: -1
-      artifactDaysToKeep: -1
-      artifactNumToKeep: -1
+      - build-discarder:
+          days-to-keep: 15
+          num-to-keep: -1
+          artifact-days-to-keep: -1
+          artifact-num-to-keep: -1
 
     parameters:
       - string:
diff --git a/ceph-deploy-docs/config/definitions/ceph-deploy-docs.yml b/ceph-deploy-docs/config/definitions/ceph-deploy-docs.yml
index 95a985081..ec6dc43aa 100644
--- a/ceph-deploy-docs/config/definitions/ceph-deploy-docs.yml
+++ b/ceph-deploy-docs/config/definitions/ceph-deploy-docs.yml
@@ -9,13 +9,13 @@
     block-upstream: false
     retry-count: 3
     properties:
+      - build-discarder:
+          days-to-keep: -1
+          num-to-keep: 10
+          artifact-days-to-keep: -1
+          artifact-num-to-keep: -1
       - github:
           url: https://github.com/ceph/ceph-deploy
-    logrotate:
-      daysToKeep: -1
-      numToKeep: 10
-      artifactDaysToKeep: -1
-      artifactNumToKeep: -1
 
     triggers:
       - github
diff --git a/ceph-deploy-pull-requests/config/definitions/ceph-deploy-pull-requests.yml b/ceph-deploy-pull-requests/config/definitions/ceph-deploy-pull-requests.yml
index d7a459a8f..4e8801c21 100644
--- a/ceph-deploy-pull-requests/config/definitions/ceph-deploy-pull-requests.yml
+++ b/ceph-deploy-pull-requests/config/definitions/ceph-deploy-pull-requests.yml
@@ -39,13 +39,13 @@
     block-upstream: false
     retry-count: 3
     properties:
+      - build-discarder:
+          days-to-keep: 15
+          num-to-keep: 30
+          artifact-days-to-keep: -1
+          artifact-num-to-keep: -1
       - github:
           url: https://github.com/ceph/ceph-deploy/
-    logrotate:
-      daysToKeep: 15
-      numToKeep: 30
-      artifactDaysToKeep: -1
-      artifactNumToKeep: -1
 
     parameters:
       - string:
diff --git a/ceph-deploy-tag/config/definitions/ceph-tag.yml b/ceph-deploy-tag/config/definitions/ceph-tag.yml
index ab726a622..d85168f05 100644
--- a/ceph-deploy-tag/config/definitions/ceph-tag.yml
+++ b/ceph-deploy-tag/config/definitions/ceph-tag.yml
@@ -14,14 +14,14 @@
     description: "This job clones ceph-deploy and sets the right version from the tag, pushing back to ceph-deploy.git"
     display-name: 'ceph-deploy-tag'
     node: 'trusty&&small'
-    logrotate:
-      daysToKeep: -1
-      numToKeep: 25
-      artifactDaysToKeep: -1
-      artifactNumToKeep: -1
     block-downstream: false
     block-upstream: false
     properties:
+      - build-discarder:
+          days-to-keep: -1
+          num-to-keep: 25
+          artifact-days-to-keep: -1
+          artifact-num-to-keep: -1
       - github:
           url: https://github.com/ceph/ceph-deploy
 
diff --git a/ceph-dev-new-setup/config/definitions/ceph-dev-new-setup.yml b/ceph-dev-new-setup/config/definitions/ceph-dev-new-setup.yml
index 99929af0d..18c7832e5 100644
--- a/ceph-dev-new-setup/config/definitions/ceph-dev-new-setup.yml
+++ b/ceph-dev-new-setup/config/definitions/ceph-dev-new-setup.yml
@@ -5,15 +5,15 @@
     # FIXME: unpin when this gets ported over
     node: huge && trusty && x86_64
     display-name: 'ceph-dev-new-setup'
-    logrotate:
-      daysToKeep: -1
-      numToKeep: 25
-      artifactDaysToKeep: -1
-      artifactNumToKeep: -1
     block-downstream: false
     block-upstream: false
     concurrent: true
     properties:
+      - build-discarder:
+          days-to-keep: -1
+          num-to-keep: 25
+          artifact-days-to-keep: -1
+          artifact-num-to-keep: -1
       - github:
           url: https://github.com/ceph/ceph-ci
 
diff --git a/ceph-dev-new-trigger/config/definitions/ceph-dev-new-trigger.yml b/ceph-dev-new-trigger/config/definitions/ceph-dev-new-trigger.yml
index 39ef024c0..3d7c5906c 100644
--- a/ceph-dev-new-trigger/config/definitions/ceph-dev-new-trigger.yml
+++ b/ceph-dev-new-trigger/config/definitions/ceph-dev-new-trigger.yml
@@ -7,14 +7,14 @@
     block-downstream: false
     block-upstream: false
     properties:
+      - build-discarder:
+          days-to-keep: 1
+          num-to-keep: 10
+          artifact-days-to-keep: -1
+          artifact-num-to-keep: -1
       - github:
           url: https://github.com/ceph/ceph-ci
     discard-old-builds: true
-    logrotate:
-      daysToKeep: 1
-      numToKeep: 10
-      artifactDaysToKeep: -1
-      artifactNumToKeep: -1
 
     triggers:
       - github
diff --git a/ceph-dev-new/config/definitions/ceph-dev-new.yml b/ceph-dev-new/config/definitions/ceph-dev-new.yml
index 7c7c3c94e..29e22f629 100644
--- a/ceph-dev-new/config/definitions/ceph-dev-new.yml
+++ b/ceph-dev-new/config/definitions/ceph-dev-new.yml
@@ -6,14 +6,14 @@
     defaults: global
     concurrent: true
     display-name: 'ceph-dev-new'
-    logrotate:
-      daysToKeep: -1
-      numToKeep: 25
-      artifactDaysToKeep: 25
-      artifactNumToKeep: 25
     block-downstream: false
     block-upstream: false
     properties:
+      - build-discarder:
+          days-to-keep: -1
+          num-to-keep: 25
+          artifact-days-to-keep: 25
+          artifact-num-to-keep: 25
       - github:
           url: https://github.com/ceph/ceph-ci
 
diff --git a/ceph-dev-setup/config/definitions/ceph-dev-setup.yml b/ceph-dev-setup/config/definitions/ceph-dev-setup.yml
index a8903a183..122150438 100644
--- a/ceph-dev-setup/config/definitions/ceph-dev-setup.yml
+++ b/ceph-dev-setup/config/definitions/ceph-dev-setup.yml
@@ -5,15 +5,15 @@
     # FIXME: unpin when this gets ported over
     node: huge && trusty && x86_64
     display-name: 'ceph-dev-setup'
-    logrotate:
-      daysToKeep: -1
-      numToKeep: 25
-      artifactDaysToKeep: -1
-      artifactNumToKeep: -1
     block-downstream: false
     block-upstream: false
     concurrent: true
     properties:
+      - build-discarder:
+          days-to-keep: -1
+          num-to-keep: 25
+          artifact-days-to-keep: -1
+          artifact-num-to-keep: -1
       - github:
           url: https://github.com/ceph/ceph
 
@@ -46,7 +46,7 @@
 
       - postbuildscript:
           script-only-if-failed: True
-          script-only-if-succeeded: False 
+          script-only-if-succeeded: False
           builders:
             - shell:
                 !include-raw:
diff --git a/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml b/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml
index d0ca9c66a..e7b3f49dc 100644
--- a/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml
+++ b/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml
@@ -7,14 +7,14 @@
     block-downstream: false
     block-upstream: false
     properties:
+      - build-discarder:
+          days-to-keep: 1
+          num-to-keep: 10
+          artifact-days-to-keep: -1
+          artifact-num-to-keep: -1
       - github:
           url: https://github.com/ceph/ceph
     discard-old-builds: true
-    logrotate:
-      daysToKeep: 1
-      numToKeep: 10
-      artifactDaysToKeep: -1
-      artifactNumToKeep: -1
 
     triggers:
       - github
diff --git a/ceph-dev/config/definitions/ceph-dev.yml b/ceph-dev/config/definitions/ceph-dev.yml
index 385fc6b3d..9999cb338 100644
--- a/ceph-dev/config/definitions/ceph-dev.yml
+++ b/ceph-dev/config/definitions/ceph-dev.yml
@@ -6,14 +6,14 @@
     defaults: global
     concurrent: true
     display-name: 'ceph-dev'
-    logrotate:
-      daysToKeep: -1
-      numToKeep: 25
-      artifactDaysToKeep: 25
-      artifactNumToKeep: 25
     block-downstream: false
     block-upstream: false
     properties:
+      - build-discarder:
+          days-to-keep: -1
+          num-to-keep: 25
+          artifact-days-to-keep: 25
+          artifact-num-to-keep: 25
       - github:
           url: https://github.com/ceph/ceph
 
diff --git a/ceph-docs/config/definitions/ceph-docs.yml b/ceph-docs/config/definitions/ceph-docs.yml
index 30688f3af..da1860b2c 100644
--- a/ceph-docs/config/definitions/ceph-docs.yml
+++ b/ceph-docs/config/definitions/ceph-docs.yml
@@ -7,14 +7,14 @@
     block-downstream: false
     block-upstream: false
     properties:
+      - build-discarder:
+          days-to-keep: 1
+          num-to-keep: 10
+          artifact-days-to-keep: -1
+          artifact-num-to-keep: -1
       - github:
           url: https://github.com/ceph/ceph
     discard-old-builds: true
-    logrotate:
-      daysToKeep: 1
-      numToKeep: 10
-      artifactDaysToKeep: -1
-      artifactNumToKeep: -1
 
     triggers:
       - github
diff --git a/ceph-iscsi-cli-trigger/config/definitions/ceph-iscsi-cli-trigger.yml b/ceph-iscsi-cli-trigger/config/definitions/ceph-iscsi-cli-trigger.yml
index 8e2743663..15e25d125 100644
--- a/ceph-iscsi-cli-trigger/config/definitions/ceph-iscsi-cli-trigger.yml
+++ b/ceph-iscsi-cli-trigger/config/definitions/ceph-iscsi-cli-trigger.yml
@@ -7,14 +7,14 @@
     block-downstream: false
     block-upstream: false
     properties:
+      - build-discarder:
+          days-to-keep: 1
+          num-to-keep: 10
+          artifact-days-to-keep: -1
+          artifact-num-to-keep: -1
       - github:
           url: https://github.com/ceph/ceph-iscsi-cli
     discard-old-builds: true
-    logrotate:
-      daysToKeep: 1
-      numToKeep: 10
-      artifactDaysToKeep: -1
-      artifactNumToKeep: -1
 
     triggers:
       - github
diff --git a/ceph-iscsi-config-trigger/config/definitions/ceph-iscsi-config-trigger.yml b/ceph-iscsi-config-trigger/config/definitions/ceph-iscsi-config-trigger.yml
index 706f50948..dd51a99a7 100644
--- a/ceph-iscsi-config-trigger/config/definitions/ceph-iscsi-config-trigger.yml
+++ b/ceph-iscsi-config-trigger/config/definitions/ceph-iscsi-config-trigger.yml
@@ -7,14 +7,14 @@
     block-downstream: false
     block-upstream: false
     properties:
+      - build-discarder:
+          days-to-keep: 1
+          num-to-keep: 10
+          artifact-days-to-keep: -1
+          artifact-num-to-keep: -1
       - github:
           url: https://github.com/ceph/ceph-iscsi-config
     discard-old-builds: true
-    logrotate:
-      daysToKeep: 1
-      numToKeep: 10
-      artifactDaysToKeep: -1
-      artifactNumToKeep: -1
 
     triggers:
       - github
diff --git a/ceph-iscsi-tools-trigger/config/definitions/ceph-iscsi-tools-trigger.yml b/ceph-iscsi-tools-trigger/config/definitions/ceph-iscsi-tools-trigger.yml
index 2b74073e4..5db7fcd45 100644
--- a/ceph-iscsi-tools-trigger/config/definitions/ceph-iscsi-tools-trigger.yml
+++ b/ceph-iscsi-tools-trigger/config/definitions/ceph-iscsi-tools-trigger.yml
@@ -7,14 +7,14 @@
     block-downstream: false
     block-upstream: false
     properties:
+      - build-discarder:
+          days-to-keep: 1
+          num-to-keep: 10
+          artifact-days-to-keep: -1
+          artifact-num-to-keep: -1
       - github:
           url: https://github.com/ceph/ceph-iscsi-tools
     discard-old-builds: true
-    logrotate:
-      daysToKeep: 1
-      numToKeep: 10
-      artifactDaysToKeep: -1
-      artifactNumToKeep: -1
 
     triggers:
       - github
diff --git a/ceph-medic-docs/config/definitions/ceph-medic-docs.yml b/ceph-medic-docs/config/definitions/ceph-medic-docs.yml
index 07565461e..01d7b7528 100644
--- a/ceph-medic-docs/config/definitions/ceph-medic-docs.yml
+++ b/ceph-medic-docs/config/definitions/ceph-medic-docs.yml
@@ -9,13 +9,13 @@
     block-upstream: false
     retry-count: 3
     properties:
+      - build-discarder:
+          days-to-keep: -1
+          num-to-keep: 10
+          artifact-days-to-keep: -1
+          artifact-num-to-keep: -1
       - github:
           url: https://github.com/ceph/ceph-medic
-    logrotate:
-      daysToKeep: -1
-      numToKeep: 10
-      artifactDaysToKeep: -1
-      artifactNumToKeep: -1
 
     triggers:
       - github
diff --git a/ceph-medic-pull-requests/config/definitions/ceph-medic-pull-requests.yml b/ceph-medic-pull-requests/config/definitions/ceph-medic-pull-requests.yml
index 4f0f10437..9bf835279 100644
--- a/ceph-medic-pull-requests/config/definitions/ceph-medic-pull-requests.yml
+++ b/ceph-medic-pull-requests/config/definitions/ceph-medic-pull-requests.yml
@@ -1,5 +1,5 @@
 - scm:
-    name: ceph-medic 
+    name: ceph-medic
     scm:
       - git:
           url: https://github.com/ceph/ceph-medic
@@ -25,13 +25,13 @@
     quiet-period: 5
     retry-count: 3
 
-    logrotate:
-      daysToKeep: 15
-      numToKeep: 30
-      artifactDaysToKeep: 15
-      artifactNumToKeep: 15
 
     properties:
+      - build-discarder:
+          days-to-keep: 15
+          num-to-keep: 30
+          artifact-days-to-keep: 15
+          artifact-num-to-keep: 15
       - github:
           url: https://github.com/ceph/ceph-medic/
 
diff --git a/ceph-medic-rpm/config/definitions/ceph-medic-rpm.yml b/ceph-medic-rpm/config/definitions/ceph-medic-rpm.yml
index 594849cdd..8a0c4c058 100644
--- a/ceph-medic-rpm/config/definitions/ceph-medic-rpm.yml
+++ b/ceph-medic-rpm/config/definitions/ceph-medic-rpm.yml
@@ -12,14 +12,14 @@
     block-upstream: false
     retry-count: 3
     properties:
+      - build-discarder:
+          days-to-keep: 1
+          num-to-keep: 10
+          artifact-days-to-keep: -1
+          artifact-num-to-keep: -1
       - github:
           url: https://github.com/ceph/ceph-medic
     discard-old-builds: true
-    logrotate:
-      daysToKeep: 1
-      numToKeep: 10
-      artifactDaysToKeep: -1
-      artifactNumToKeep: -1
 
     triggers:
       - github
diff --git a/ceph-medic-tests/config/definitions/ceph-medic-tests.yml b/ceph-medic-tests/config/definitions/ceph-medic-tests.yml
index f2c164279..757ea8802 100644
--- a/ceph-medic-tests/config/definitions/ceph-medic-tests.yml
+++ b/ceph-medic-tests/config/definitions/ceph-medic-tests.yml
@@ -7,7 +7,7 @@
 
 - job-template:
     name: 'ceph-medic-tests-{scenario}'
-    node: vagrant && libvirt 
+    node: vagrant && libvirt
     project-type: freestyle
     defaults: global
     display-name: 'ceph-medic: Tests [{scenario}]'
@@ -18,11 +18,11 @@
     properties:
       - github:
           url: https://github.com/ceph/ceph-medic
-    logrotate:
-      daysToKeep: -1
-      numToKeep: -1
-      artifactDaysToKeep: -1
-      artifactNumToKeep: -1
+      - build-discarder:
+          days-to-keep: -1
+          num-to-keep: -1
+          artifact-days-to-keep: -1
+          artifact-num-to-keep: -1
 
     parameters:
       - string:
@@ -42,7 +42,7 @@
       - git:
           url: https://github.com/ceph/ceph-medic.git
           branches:
-            - $CEPH_MEDIC_BRANCH 
+            - $CEPH_MEDIC_BRANCH
           browser: auto
           timeout: 20
 
diff --git a/ceph-pr-arm-trigger/config/definitions/ceph-pr-arm-trigger.yml b/ceph-pr-arm-trigger/config/definitions/ceph-pr-arm-trigger.yml
index cc56eb9fb..88860f8a1 100644
--- a/ceph-pr-arm-trigger/config/definitions/ceph-pr-arm-trigger.yml
+++ b/ceph-pr-arm-trigger/config/definitions/ceph-pr-arm-trigger.yml
@@ -10,14 +10,14 @@
     block-downstream: false
     block-upstream: false
     properties:
+      - build-discarder:
+          days-to-keep: 1
+          num-to-keep: 10
+          artifact-days-to-keep: -1
+          artifact-num-to-keep: -1
       - github:
           url: https://github.com/ceph/ceph
     discard-old-builds: true
-    logrotate:
-      daysToKeep: 1
-      numToKeep: 10
-      artifactDaysToKeep: -1
-      artifactNumToKeep: -1
 
     triggers:
       - github-pull-request:
diff --git a/ceph-pr-commits/config/definitions/ceph-pr-commits.yml b/ceph-pr-commits/config/definitions/ceph-pr-commits.yml
index 6fac9e130..8a8df2ed9 100644
--- a/ceph-pr-commits/config/definitions/ceph-pr-commits.yml
+++ b/ceph-pr-commits/config/definitions/ceph-pr-commits.yml
@@ -38,13 +38,13 @@
     block-upstream: false
     retry-count: 3
     properties:
+      - build-discarder:
+          days-to-keep: 15
+          num-to-keep: 30
+          artifact-days-to-keep: -1
+          artifact-num-to-keep: -1
       - github:
           url: https://github.com/ceph/ceph/
-    logrotate:
-      daysToKeep: 15
-      numToKeep: 30
-      artifactDaysToKeep: -1
-      artifactNumToKeep: -1
 
     parameters:
       - string:
diff --git a/ceph-pr-docs/config/definitions/ceph-pr-docs.yml b/ceph-pr-docs/config/definitions/ceph-pr-docs.yml
index 87896d27a..63241f283 100644
--- a/ceph-pr-docs/config/definitions/ceph-pr-docs.yml
+++ b/ceph-pr-docs/config/definitions/ceph-pr-docs.yml
@@ -11,9 +11,10 @@
     properties:
       - github:
           url: https://github.com/ceph/ceph
+      - build-discarder:
+          days-to-keep: 14
+
     discard-old-builds: true
-    logrotate:
-      daysToKeep: 14
 
     triggers:
       - github-pull-request:
diff --git a/ceph-pr-render-docs/config/definitions/ceph-pr-render-docs.yml b/ceph-pr-render-docs/config/definitions/ceph-pr-render-docs.yml
index 4bc132476..ebf1923a0 100644
--- a/ceph-pr-render-docs/config/definitions/ceph-pr-render-docs.yml
+++ b/ceph-pr-render-docs/config/definitions/ceph-pr-render-docs.yml
@@ -10,9 +10,9 @@
     properties:
       - github:
           url: https://github.com/ceph/ceph
+      - build-discarder:
+          days-to-keep: 14
     discard-old-builds: true
-    logrotate:
-      daysToKeep: 14
 
     triggers:
       - github-pull-request:
diff --git a/ceph-pr-submodules/config/definitions/ceph-pr-commits.yml b/ceph-pr-submodules/config/definitions/ceph-pr-commits.yml
index f9e298742..623a57d96 100644
--- a/ceph-pr-submodules/config/definitions/ceph-pr-commits.yml
+++ b/ceph-pr-submodules/config/definitions/ceph-pr-commits.yml
@@ -10,13 +10,13 @@
     block-upstream: false
     retry-count: 3
     properties:
+      - build-discarder:
+          days-to-keep: 15
+          num-to-keep: 30
+          artifact-days-to-keep: -1
+          artifact-num-to-keep: -1
       - github:
           url: https://github.com/ceph/ceph/
-    logrotate:
-      daysToKeep: 15
-      numToKeep: 30
-      artifactDaysToKeep: -1
-      artifactNumToKeep: -1
 
     parameters:
       - string:
diff --git a/ceph-pull-requests/config/definitions/ceph-pull-requests.yml b/ceph-pull-requests/config/definitions/ceph-pull-requests.yml
index 245d26252..edc20ff1c 100644
--- a/ceph-pull-requests/config/definitions/ceph-pull-requests.yml
+++ b/ceph-pull-requests/config/definitions/ceph-pull-requests.yml
@@ -10,13 +10,13 @@
     block-upstream: false
     retry-count: 3
     properties:
+      - build-discarder:
+          days-to-keep: 15
+          num-to-keep: 300
+          artifact-days-to-keep: -1
+          artifact-num-to-keep: -1
       - github:
           url: https://github.com/ceph/ceph/
-    logrotate:
-      daysToKeep: 15
-      numToKeep: 300
-      artifactDaysToKeep: -1
-      artifactNumToKeep: -1
 
     parameters:
       - string:
diff --git a/ceph-qa-suite-pull-requests/config/definitions/ceph-qa-suite-pull-requests.yml b/ceph-qa-suite-pull-requests/config/definitions/ceph-qa-suite-pull-requests.yml
index 461fa0311..05687494d 100644
--- a/ceph-qa-suite-pull-requests/config/definitions/ceph-qa-suite-pull-requests.yml
+++ b/ceph-qa-suite-pull-requests/config/definitions/ceph-qa-suite-pull-requests.yml
@@ -10,13 +10,13 @@
     block-upstream: false
     retry-count: 3
     properties:
+      - build-discarder:
+          days-to-keep: 15
+          num-to-keep: 30
+          artifact-days-to-keep: -1
+          artifact-num-to-keep: -1
       - github:
           url: https://github.com/ceph/ceph-qa-suite/
-    logrotate:
-      daysToKeep: 15
-      numToKeep: 30
-      artifactDaysToKeep: -1
-      artifactNumToKeep: -1
 
     parameters:
       - string:
diff --git a/ceph-setup/config/definitions/ceph-setup.yml b/ceph-setup/config/definitions/ceph-setup.yml
index a6fbe607c..95935293d 100644
--- a/ceph-setup/config/definitions/ceph-setup.yml
+++ b/ceph-setup/config/definitions/ceph-setup.yml
@@ -5,15 +5,15 @@
     # FIXME: unpin when this gets ported over
     node: huge && trusty && x86_64
     display-name: 'ceph-setup'
-    logrotate:
-      daysToKeep: -1
-      numToKeep: 25
-      artifactDaysToKeep: -1
-      artifactNumToKeep: -1
     block-downstream: false
     block-upstream: false
     concurrent: true
     properties:
+      - build-discarder:
+          days-to-keep: -1
+          num-to-keep: 25
+          artifact-days-to-keep: -1
+          artifact-num-to-keep: -1
       - github:
           url: https://github.com/ceph/ceph
 
diff --git a/ceph-tag/config/definitions/ceph-tag.yml b/ceph-tag/config/definitions/ceph-tag.yml
index fab9aed87..aac9c479f 100644
--- a/ceph-tag/config/definitions/ceph-tag.yml
+++ b/ceph-tag/config/definitions/ceph-tag.yml
@@ -16,14 +16,14 @@
     node: trusty
     description: "This job clones from upstream Ceph, sets the right version from the tag and pushes changes to ceph-releases"
     display-name: 'ceph-tag'
-    logrotate:
-      daysToKeep: -1
-      numToKeep: 25
-      artifactDaysToKeep: -1
-      artifactNumToKeep: -1
     block-downstream: false
     block-upstream: false
     properties:
+      - build-discarder:
+          days-to-keep: -1
+          num-to-keep: 25
+          artifact-days-to-keep: -1
+          artifact-num-to-keep: -1
       - github:
           url: https://github.com/ceph/ceph
 
diff --git a/ceph-volume-ansible-prs/config/definitions/ceph-volume-pr.yml b/ceph-volume-ansible-prs/config/definitions/ceph-volume-pr.yml
index 4de002b30..ca71a7669 100644
--- a/ceph-volume-ansible-prs/config/definitions/ceph-volume-pr.yml
+++ b/ceph-volume-ansible-prs/config/definitions/ceph-volume-pr.yml
@@ -47,9 +47,9 @@
     properties:
       - github:
           url: https://github.com/ceph/ceph
+      - build-discarder:
+          days-to-keep: 30
     discard-old-builds: true
-    logrotate:
-      daysToKeep: 30
 
     parameters:
       - string:
diff --git a/ceph-volume-nightly/config/definitions/ceph-volume-nightly.yml b/ceph-volume-nightly/config/definitions/ceph-volume-nightly.yml
index f81f0d539..861e1d3f0 100644
--- a/ceph-volume-nightly/config/definitions/ceph-volume-nightly.yml
+++ b/ceph-volume-nightly/config/definitions/ceph-volume-nightly.yml
@@ -53,9 +53,9 @@
     properties:
       - github:
           url: https://github.com/ceph/ceph
+      - build-discarder:
+          days-to-keep: 30
     discard-old-builds: true
-    logrotate:
-      daysToKeep: 30
 
     triggers:
       - timed: '@daily'
diff --git a/ceph-volume-pr/config/definitions/ceph-volume-pr.yml b/ceph-volume-pr/config/definitions/ceph-volume-pr.yml
index b1a4449c7..e3c5a9ce4 100644
--- a/ceph-volume-pr/config/definitions/ceph-volume-pr.yml
+++ b/ceph-volume-pr/config/definitions/ceph-volume-pr.yml
@@ -10,9 +10,9 @@
     properties:
       - github:
           url: https://github.com/ceph/ceph
+      - build-discarder:
+          days-to-keep: 14
     discard-old-builds: true
-    logrotate:
-      daysToKeep: 14
 
     parameters:
       - string:
diff --git a/ceph-volume-scenario/config/definitions/ceph-volume-scenario.yml b/ceph-volume-scenario/config/definitions/ceph-volume-scenario.yml
index 9816f6dce..aba0341ef 100644
--- a/ceph-volume-scenario/config/definitions/ceph-volume-scenario.yml
+++ b/ceph-volume-scenario/config/definitions/ceph-volume-scenario.yml
@@ -10,17 +10,17 @@
     block-upstream: false
     retry-count: 3
     properties:
+      - build-discarder:
+          days-to-keep: 15
+          num-to-keep: 30
+          artifact-days-to-keep: -1
+          artifact-num-to-keep: -1
       - github:
           url: https://github.com/ceph/ceph
-    logrotate:
-      daysToKeep: 15
-      numToKeep: 30
-      artifactDaysToKeep: -1
-      artifactNumToKeep: -1
 
     parameters:
       - string:
-          name: SUBCOMMAND 
+          name: SUBCOMMAND
           description: "The subcommand in ceph-volume we are testing. (lvm or simple)"
           default: "lvm"
       - string:
diff --git a/ceph-volume-test/config/definitions/ceph-volume-test.yml b/ceph-volume-test/config/definitions/ceph-volume-test.yml
index e25d27360..7b6d33b46 100644
--- a/ceph-volume-test/config/definitions/ceph-volume-test.yml
+++ b/ceph-volume-test/config/definitions/ceph-volume-test.yml
@@ -1,18 +1,18 @@
 - job:
-    name: "ceph-volume-test" 
+    name: "ceph-volume-test"
     description: 'This job will trigger all ceph-volume functional tests given a branch and sha1.'
     project-type: multijob
     defaults: global
     display-name: 'ceph-volume functional test suite'
-    logrotate:
-      daysToKeep: 90
-      numToKeep: 25
-      artifactDaysToKeep: 25
-      artifactNumToKeep: 25
     block-downstream: false
     block-upstream: false
     concurrent: true
     properties:
+      - build-discarder:
+          days-to-keep: 90
+          num-to-keep: 25
+          artifact-days-to-keep: 25
+          artifact-num-to-keep: 25
       - github:
           url: https://github.com/ceph/ceph
 
diff --git a/ceph/config/definitions/ceph.yml b/ceph/config/definitions/ceph.yml
index dd2f36c6f..0a76466b1 100644
--- a/ceph/config/definitions/ceph.yml
+++ b/ceph/config/definitions/ceph.yml
@@ -4,15 +4,15 @@
     project-type: multijob
     defaults: global
     display-name: 'ceph'
-    logrotate:
-      daysToKeep: -1
-      numToKeep: 25
-      artifactDaysToKeep: 25
-      artifactNumToKeep: 25
     block-downstream: false
     block-upstream: false
     concurrent: true
     properties:
+      - build-discarder:
+          days-to-keep: -1
+          num-to-keep: 25
+          artifact-days-to-keep: 25
+          artifact-num-to-keep: 25
       - github:
           url: https://github.com/ceph/ceph
 
diff --git a/cephmetrics-pull-requests/config/definitions/cephmetrics-pull-requests.yml b/cephmetrics-pull-requests/config/definitions/cephmetrics-pull-requests.yml
index 658bf09f5..b3f7231b4 100644
--- a/cephmetrics-pull-requests/config/definitions/cephmetrics-pull-requests.yml
+++ b/cephmetrics-pull-requests/config/definitions/cephmetrics-pull-requests.yml
@@ -10,13 +10,13 @@
     block-upstream: false
     retry-count: 3
     properties:
+      - build-discarder:
+          days-to-keep: 15
+          num-to-keep: 30
+          artifact-days-to-keep: -1
+          artifact-num-to-keep: -1
       - github:
           url: https://github.com/ceph/cephmetrics/
-    logrotate:
-      daysToKeep: 15
-      numToKeep: 30
-      artifactDaysToKeep: -1
-      artifactNumToKeep: -1
 
     parameters:
       - string:
diff --git a/chacra-pull-requests/config/definitions/chacra-pull-requests.yml b/chacra-pull-requests/config/definitions/chacra-pull-requests.yml
index ec13d1867..02664fd6c 100644
--- a/chacra-pull-requests/config/definitions/chacra-pull-requests.yml
+++ b/chacra-pull-requests/config/definitions/chacra-pull-requests.yml
@@ -38,13 +38,13 @@
     quiet-period: 5
     retry-count: 3
 
-    logrotate:
-      daysToKeep: 15
-      numToKeep: 30
-      artifactDaysToKeep: 15
-      artifactNumToKeep: 15
 
     properties:
+      - build-discarder:
+          days-to-keep: 15
+          num-to-keep: 30
+          artifact-days-to-keep: 15
+          artifact-num-to-keep: 15
       - github:
           url: https://github.com/ceph/chacra/
 
diff --git a/diamond-setup/config/definitions/diamond-setup.yml b/diamond-setup/config/definitions/diamond-setup.yml
index d5bfadbf5..85a9a110b 100644
--- a/diamond-setup/config/definitions/diamond-setup.yml
+++ b/diamond-setup/config/definitions/diamond-setup.yml
@@ -5,15 +5,15 @@
     # FIXME: unpin when this gets ported over
     node: small && trusty
     display-name: 'diamond-setup'
-    logrotate:
-      daysToKeep: -1
-      numToKeep: 25
-      artifactDaysToKeep: -1
-      artifactNumToKeep: -1
     block-downstream: false
     block-upstream: false
     concurrent: true
     properties:
+      - build-discarder:
+          days-to-keep: -1
+          num-to-keep: 25
+          artifact-days-to-keep: -1
+          artifact-num-to-keep: -1
       - github:
           url: https://github.com/ceph/Diamond
 
diff --git a/diamond/config/definitions/diamond.yml b/diamond/config/definitions/diamond.yml
index 3cb36791c..0d0a9911d 100644
--- a/diamond/config/definitions/diamond.yml
+++ b/diamond/config/definitions/diamond.yml
@@ -5,14 +5,14 @@
     defaults: global
     concurrent: true
     display-name: 'diamond'
-    logrotate:
-      daysToKeep: -1
-      numToKeep: 25
-      artifactDaysToKeep: 25
-      artifactNumToKeep: 25
     block-downstream: false
     block-upstream: false
     properties:
+      - build-discarder:
+          days-to-keep: -1
+          num-to-keep: 25
+          artifact-days-to-keep: 25
+          artifact-num-to-keep: 25
       - github:
           url: https://github.com/ceph/Diamond
 
diff --git a/kernel-trigger/config/definitions/kernel-trigger.yml b/kernel-trigger/config/definitions/kernel-trigger.yml
index d2f00432e..9d2053632 100644
--- a/kernel-trigger/config/definitions/kernel-trigger.yml
+++ b/kernel-trigger/config/definitions/kernel-trigger.yml
@@ -7,14 +7,14 @@
     block-downstream: false
     block-upstream: false
     properties:
+      - build-discarder:
+          days-to-keep: 1
+          num-to-keep: 10
+          artifact-days-to-keep: -1
+          artifact-num-to-keep: -1
       - github:
           url: https://github.com/ceph/ceph-client
     discard-old-builds: true
-    logrotate:
-      daysToKeep: 1
-      numToKeep: 10
-      artifactDaysToKeep: -1
-      artifactNumToKeep: -1
 
     triggers:
       - github
diff --git a/lab-cop/config/definitions/lab-cop.yml b/lab-cop/config/definitions/lab-cop.yml
index 76d850e43..2918e71c1 100644
--- a/lab-cop/config/definitions/lab-cop.yml
+++ b/lab-cop/config/definitions/lab-cop.yml
@@ -3,11 +3,12 @@
     node: small && xenial
     defaults: global
     display-name: 'lab-cop'
-    logrotate:
-      daysToKeep: 15
-      numToKeep: 30
-      artifactDaysToKeep: -1
-      artifactNumToKeep: -1
+    properties:
+      - build-discarder:
+          days-to-keep: 15
+          num-to-keep: 30
+          artifact-days-to-keep: -1
+          artifact-num-to-keep: -1
 
     builders:
       - shell:
diff --git a/merfi-pull-requests/config/definitions/merfi-pull-requests.yml b/merfi-pull-requests/config/definitions/merfi-pull-requests.yml
index 9d80d2086..13808fd23 100644
--- a/merfi-pull-requests/config/definitions/merfi-pull-requests.yml
+++ b/merfi-pull-requests/config/definitions/merfi-pull-requests.yml
@@ -8,13 +8,13 @@
     block-upstream: false
     retry-count: 3
     properties:
+      - build-discarder:
+          days-to-keep: 15
+          num-to-keep: 30
+          artifact-days-to-keep: -1
+          artifact-num-to-keep: -1
       - github:
           url: https://github.com/alfredodeza/merfi/
-    logrotate:
-      daysToKeep: 15
-      numToKeep: 30
-      artifactDaysToKeep: -1
-      artifactNumToKeep: -1
 
     parameters:
       - string:
diff --git a/mita-deploy/config/definitions/mita-deploy.yml b/mita-deploy/config/definitions/mita-deploy.yml
index 10f2147b0..813a2b214 100644
--- a/mita-deploy/config/definitions/mita-deploy.yml
+++ b/mita-deploy/config/definitions/mita-deploy.yml
@@ -15,14 +15,14 @@
     node: master
     description: "This job clones mita and deploys it to its production server based on the BRANCH value"
     display-name: 'mita-deploy'
-    logrotate:
-      daysToKeep: -1
-      numToKeep: 25
-      artifactDaysToKeep: -1
-      artifactNumToKeep: -1
     block-downstream: false
     block-upstream: false
     properties:
+      - build-discarder:
+          days-to-keep: -1
+          num-to-keep: 25
+          artifact-days-to-keep: -1
+          artifact-num-to-keep: -1
       - github:
           url: https://github.com/ceph/mita
 
diff --git a/radosgw-agent-pull-requests/config/definitions/radosgw-agent-pull-requests.yml b/radosgw-agent-pull-requests/config/definitions/radosgw-agent-pull-requests.yml
index ca9a18ecf..a05311abd 100644
--- a/radosgw-agent-pull-requests/config/definitions/radosgw-agent-pull-requests.yml
+++ b/radosgw-agent-pull-requests/config/definitions/radosgw-agent-pull-requests.yml
@@ -38,13 +38,13 @@
     block-upstream: false
     retry-count: 3
     properties:
+      - build-discarder:
+          days-to-keep: 15
+          num-to-keep: 30
+          artifact-days-to-keep: -1
+          artifact-num-to-keep: -1
       - github:
           url: https://github.com/ceph/radosgw-agent
-    logrotate:
-      daysToKeep: 15
-      numToKeep: 30
-      artifactDaysToKeep: -1
-      artifactNumToKeep: -1
 
     parameters:
       - string:
diff --git a/rtslib-fb-trigger/config/definitions/rtslib-fb-trigger.yml b/rtslib-fb-trigger/config/definitions/rtslib-fb-trigger.yml
index ec0f2cdad..b14d21677 100644
--- a/rtslib-fb-trigger/config/definitions/rtslib-fb-trigger.yml
+++ b/rtslib-fb-trigger/config/definitions/rtslib-fb-trigger.yml
@@ -7,14 +7,14 @@
     block-downstream: false
     block-upstream: false
     properties:
+      - build-discarder:
+          days-to-keep: 1
+          num-to-keep: 10
+          artifact-days-to-keep: -1
+          artifact-num-to-keep: -1
       - github:
           url: https://github.com/ceph/rtslib-fb
     discard-old-builds: true
-    logrotate:
-      daysToKeep: 1
-      numToKeep: 10
-      artifactDaysToKeep: -1
-      artifactNumToKeep: -1
 
     triggers:
       - github
diff --git a/samba-trigger/config/definitions/samba-trigger.yml b/samba-trigger/config/definitions/samba-trigger.yml
index 12bd7ac17..907bcf3fb 100644
--- a/samba-trigger/config/definitions/samba-trigger.yml
+++ b/samba-trigger/config/definitions/samba-trigger.yml
@@ -7,14 +7,14 @@
     block-downstream: false
     block-upstream: false
     properties:
+      - build-discarder:
+          days-to-keep: 1
+          num-to-keep: 10
+          artifact-days-to-keep: -1
+          artifact-num-to-keep: -1
       - github:
           url: https://github.com/ceph/samba
     discard-old-builds: true
-    logrotate:
-      daysToKeep: 1
-      numToKeep: 10
-      artifactDaysToKeep: -1
-      artifactNumToKeep: -1
 
     triggers:
       - github
diff --git a/sepia-fog-images/config/definitions/sepia-fog-images.yml b/sepia-fog-images/config/definitions/sepia-fog-images.yml
index 339e339a3..115c96dd9 100644
--- a/sepia-fog-images/config/definitions/sepia-fog-images.yml
+++ b/sepia-fog-images/config/definitions/sepia-fog-images.yml
@@ -8,11 +8,12 @@
     quiet-period: 0
     block-downstream: false
     block-upstream: false
-    logrotate:
-      daysToKeep: 15
-      numToKeep: 30
-      artifactDaysToKeep: -1
-      artifactNumToKeep: -1
+    properties:
+      - build-discarder:
+          days-to-keep: 15
+          num-to-keep: 30
+          artifact-days-to-keep: -1
+          artifact-num-to-keep: -1
 
     parameters:
       - string:
diff --git a/shaman-pull-requests/config/definitions/shaman-pull-requests.yml b/shaman-pull-requests/config/definitions/shaman-pull-requests.yml
index c264773f8..f416595d8 100644
--- a/shaman-pull-requests/config/definitions/shaman-pull-requests.yml
+++ b/shaman-pull-requests/config/definitions/shaman-pull-requests.yml
@@ -1,5 +1,5 @@
 - scm:
-    name: shaman 
+    name: shaman
     scm:
       - git:
           url: https://github.com/ceph/shaman
@@ -38,13 +38,13 @@
     quiet-period: 5
     retry-count: 3
 
-    logrotate:
-      daysToKeep: 15
-      numToKeep: 30
-      artifactDaysToKeep: 15
-      artifactNumToKeep: 15
 
     properties:
+      - build-discarder:
+          days-to-keep: 15
+          num-to-keep: 30
+          artifact-days-to-keep: 15
+          artifact-num-to-keep: 15
       - github:
           url: https://github.com/ceph/shaman/
 
@@ -68,7 +68,7 @@
           auto-close-on-fail: false
 
     scm:
-      - shaman 
+      - shaman
       - ceph-build
 
     builders:
diff --git a/tcmu-runner-trigger/config/definitions/tcmu-runner-trigger.yml b/tcmu-runner-trigger/config/definitions/tcmu-runner-trigger.yml
index 9160db048..9239fb6bb 100644
--- a/tcmu-runner-trigger/config/definitions/tcmu-runner-trigger.yml
+++ b/tcmu-runner-trigger/config/definitions/tcmu-runner-trigger.yml
@@ -7,14 +7,14 @@
     block-downstream: false
     block-upstream: false
     properties:
+      - build-discarder:
+          days-to-keep: 1
+          num-to-keep: 10
+          artifact-days-to-keep: -1
+          artifact-num-to-keep: -1
       - github:
           url: https://github.com/ceph/tcmu-runner
     discard-old-builds: true
-    logrotate:
-      daysToKeep: 1
-      numToKeep: 10
-      artifactDaysToKeep: -1
-      artifactNumToKeep: -1
 
     triggers:
       - github
diff --git a/teuthology-docs/config/definitions/teuthology-docs.yml b/teuthology-docs/config/definitions/teuthology-docs.yml
index bfa7b7cb5..1b3f12803 100644
--- a/teuthology-docs/config/definitions/teuthology-docs.yml
+++ b/teuthology-docs/config/definitions/teuthology-docs.yml
@@ -9,13 +9,13 @@
     block-upstream: false
     retry-count: 3
     properties:
+      - build-discarder:
+          days-to-keep: -1
+          num-to-keep: -1
+          artifact-days-to-keep: -1
+          artifact-num-to-keep: -1
       - github:
           url: https://github.com/ceph/teuthology
-    logrotate:
-      daysToKeep: -1
-      numToKeep: -1
-      artifactDaysToKeep: -1
-      artifactNumToKeep: -1
 
     triggers:
       - github
diff --git a/teuthology-pull-requests/config/definitions/teuthology-pull-requests.yml b/teuthology-pull-requests/config/definitions/teuthology-pull-requests.yml
index 95a6496e8..48eed3ad3 100644
--- a/teuthology-pull-requests/config/definitions/teuthology-pull-requests.yml
+++ b/teuthology-pull-requests/config/definitions/teuthology-pull-requests.yml
@@ -10,13 +10,13 @@
     block-upstream: false
     retry-count: 3
     properties:
+      - build-discarder:
+          days-to-keep: 15
+          num-to-keep: 30
+          artifact-days-to-keep: -1
+          artifact-num-to-keep: -1
       - github:
           url: https://github.com/ceph/teuthology/
-    logrotate:
-      daysToKeep: 15
-      numToKeep: 30
-      artifactDaysToKeep: -1
-      artifactNumToKeep: -1
 
     parameters:
       - string: