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 6f73269115f29f41d8386f0793c302cf3e91d9a9..7fb6d67a82c0a6b29f388145675ffe835cb57dd5 100644 (file)
--- 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 33295041d492c698d7a6a3c3b11de46aff886042..be4b743801138f7e40b9ceb49dd5dd0652a72904 100644 (file)
--- 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 e3ef8408d4ad592bbe774cab5119c96365021526..d5a1cd57529aee2e71a00ce1a010ecddee906dd7 100644 (file)
--- 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 a8f048db4165713989eae237334dcc05c277fa4a..5d64ab2eddd579e49ff32a99dc506ce0d6a9429f 100644 (file)
--- 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 289c47e6a9899860aa761733fc21c25ac16378bf..b757370bc9bac43425d726a7b07dae3c85e8175a 100644 (file)
--- 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 e6644f8c15bea5eaa568315e609b6f087e6174d9..a12b5470519c6eb46fa203a1c154e9962bc7ed42 100644 (file)
--- 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 a5b41130279337b8fd57c2b922634a8b33144968..df438ef3231d827bb04c87e94f960eb8bbd12510 100644 (file)
--- 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 12553795b74b436f5a74fc51fabf8c8021c9335f..2cf8cfdaf9f1f1674328f53de1891b0fc719973b 100644 (file)
--- 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 81eb7d72e6d32e675f90c489fcbb32a531cd4ce2..8c1c479bc47279c5978155101c5530ea87ccaa2e 100644 (file)
--- 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 639d7d8ec8314cd6a57bda3f94b41e9cb3c7ab0d..1bbc4b34fa0b6b5556ee3805f0f56091fc9719ae 100644 (file)
--- 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 3401e8288f981a089428c0f1250570422d89404b..e4c6a1a79e5b77ac59720a8382a4e2e81a594793 100644 (file)
--- 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 a42116f550f5ccee6d3c8445244725f764aaf6d1..c31e077061a17afcaa864aaed6c51a047aacaa57 100644 (file)
--- 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 f9f1c62a355560f2a400db2bce847e478307568b..99b638c45a12680b4e1e3f9f4ce10f64871e058d 100644 (file)
--- 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 e353027eeab3854a0f479a26e187645859a05f56..b71e7985b5509cd260b6279766e5cd200d90db3e 100644 (file)
--- 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 a5cf82f0f9dc148808f9e3d5781c4f766777badc..75686e9a852150d7d12bd4cd15465726a383b9a2 100644 (file)
--- 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 b9781bfda9f4a1c102cc7e177c58032cef3061d8..9043e0363a3cc7ee97ba00d1395f417db865d8dd 100644 (file)
--- 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 95a985081364292aa5153df362f9b68f11c5d409..ec6dc43aab84990a93866358241c13681482281a 100644 (file)
--- 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 d7a459a8f46a49c5eb610cc6bb553e794604344c..4e8801c214b6d36757dbc4cf378a386506d26fb7 100644 (file)
--- 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 ab726a622913d9b10d27a71a3693cc971e2da548..d85168f05819ca81dff9087380d641d0ca60580d 100644 (file)
--- 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 99929af0d79350aa5932fe38accec7f2fe6c115c..18c7832e52b6352d24b1600681df2cf73f2deee4 100644 (file)
--- 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 39ef024c065185d559dc287c21ea2a92acdebc2d..3d7c5906c96e31ab35a5386b338d2088706a4c56 100644 (file)
--- 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 7c7c3c94e91c017fcc17d04767c4ae0bddf1d129..29e22f6294044e1ddf5db0492d18dfb7bbeeba4d 100644 (file)
--- 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 a8903a183bafa411f485a870684a4a846e9fecb8..122150438fa920aec0c9171c10f17a7e749603a9 100644 (file)
--- 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 d0ca9c66ae086a3dc2720c4c1cbfb9b450c12839..e7b3f49dcc89881eb0e144e9583db919fabb3957 100644 (file)
--- 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 385fc6b3dd2fe0df6f342e309a68ab55acd7e7b1..9999cb3386ee4163e5ace26e71c4deb139817481 100644 (file)
--- 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 30688f3af56c26167876737889eb563ae31880ba..da1860b2cc35d71085667cf9d379432c96cc22be 100644 (file)
--- 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 8e274366303032e9878d5ac3d5997ff498f92f50..15e25d1250dd5e17bbc5f392753903032325c6a5 100644 (file)
--- 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 706f50948d47fa70bba0a1981efc78c9307330b6..dd51a99a7eb9d1f6e49015c327ee4e04a9089f84 100644 (file)
--- 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 2b74073e40619b4478c3d21c59d74e17ac504b73..5db7fcd4574b68ec13a0220c575ded654a703e30 100644 (file)
--- 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 07565461ef1dcb725e74bfe2ecff8906d1aca672..01d7b75281edcb424cc08d54c9795e64bb946f79 100644 (file)
--- 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 4f0f1043705da01937b46f54828cc22191cf86fa..9bf835279d4a589020ac69f92218023d87887ccc 100644 (file)
--- 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 594849cdd0aa119cffa8a50aa3dd9ee1dd3b65e4..8a0c4c0582dec81b6624b8e4386a0a3b84ccc2f2 100644 (file)
--- 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 f2c164279c9dd9a48cff1b7385f1324e478227df..757ea88027aedebd9b7ad2960754a33886bf2f3b 100644 (file)
--- 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 cc56eb9fb4a3c58b6ef2be015d79fce80e85fa0f..88860f8a1f1e9751f3836aaae57e036cf3d56e85 100644 (file)
--- 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 6fac9e13054ee5a118942b740245242a06492589..8a8df2ed9350a28ab510424aad075b367d18a7dc 100644 (file)
--- 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 87896d27a86f3858e6c0896d9e559a1a38be0caa..63241f2832ae36ae186ff59aba8702c4886786b8 100644 (file)
--- 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 4bc13247636aec54e5e2bee74268ea1d49cbb4c8..ebf1923a0a8989662678b6da50dba4158d95a32a 100644 (file)
--- 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 f9e2987421e25653ca5f695c96aff1e97f842997..623a57d96cce3f56ac27b79ce2817ba75b3e635f 100644 (file)
--- 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 245d26252d426baead97db2cff8e99983c646915..edc20ff1cc79c2dfce4eece2377c10c37bc1d1d3 100644 (file)
--- 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 461fa031163443e75238cb496d8af88b867545e5..05687494d5dadd5428950326221d9827fb93d5cc 100644 (file)
--- 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 a6fbe607c03a711df10b578fdff928629087f776..95935293d42381f9be5e59d1d40f32175242a0a8 100644 (file)
--- 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 fab9aed879b96942a686041934758e47d66be2df..aac9c479f01c8f6e8396be6f823f8a7debf78f5a 100644 (file)
--- 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 4de002b30106cec730a90be24ce38e23de7242f5..ca71a766909f3cf461b5df6d162781f72dd701cc 100644 (file)
--- 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 f81f0d539c6d4de7c7990c54a173f7f556c962a3..861e1d3f05ad031258925d316f119b76feda629e 100644 (file)
--- 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 b1a4449c772d16c2e6b647f8833e2e9ba943c552..e3c5a9ce4f0adc4e658be22e561ad397c03defa6 100644 (file)
--- 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 9816f6dceef8d4d89a56de2a400d81cac7949e0d..aba0341ef5171a41fd2e724c820d44a48acfcb37 100644 (file)
--- 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 e25d27360205278d7c9b8aa0d801a9eedcf0bce9..7b6d33b46f31a982f1e7f644a5dc9b6849d50737 100644 (file)
--- 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 dd2f36c6fdb7be45d6a9327f019aa5f354fe7dc5..0a76466b172b3b37433ca7360b84429c34ad7a15 100644 (file)
--- 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 658bf09f554e190af3a871e101592b8228a015d1..b3f7231b4aa528c5ff0f4be667abc059c1a7193b 100644 (file)
--- 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 ec13d18677bed372a922f53f27bf1f495a83b2ff..02664fd6c99528c2be7f93a57d8cb1a09773041f 100644 (file)
--- 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 d5bfadbf5895fc01cc70ff0a7a88818561eaed76..85a9a110b5dcc6c71742aa884db1f417fa0c18a3 100644 (file)
--- 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 3cb36791c3b8790ef21e3529f2b20af79b4be4be..0d0a9911ddac5268c92c52c27082669c3bdc8057 100644 (file)
--- 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 d2f00432e73b1aabe5a16e46ea207c807e734201..9d2053632d4f55d4574c9264425b57fce630562c 100644 (file)
--- 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 76d850e431c07db55623d5c5e5db33b2675a16a2..2918e71c1e0153077742e363c5cee5674f163c7a 100644 (file)
--- 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 9d80d208673183b71865f212f906d4b74d1a5b85..13808fd23838a1ca1f9383f7d70a1127d30602af 100644 (file)
--- 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 10f2147b0a7b42e863bc07312002d46f243c8de7..813a2b214baf52d986e4215bf552ce38e63346f3 100644 (file)
--- 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 ca9a18ecfb432a051735d0ea3a3a0c71014f052b..a05311abd1309d7e990a9cb2783ed526f53f58d7 100644 (file)
--- 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 ec0f2cdad97716d0c4cd2aa82a9b26b4097a3fb9..b14d216775a872a63bb108eae89633fa502dd757 100644 (file)
--- 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 12bd7ac17e68edbfc45bf4e886bd1a2b3876829c..907bcf3fb1de66584e933f8f7f448977e862f76d 100644 (file)
--- 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 339e339a31f36fd66f158a05c420ce8fe8381186..115c96dd948037237f4b3604f1e598ac1156f915 100644 (file)
--- 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 c264773f8e9a57c1890f69fd80b53eafc64d5d9a..f416595d82bea318be10af2dc3ef01d4d2b1499e 100644 (file)
--- 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 9160db048c1e8f9f6efa3573056ea2142c62ccb3..9239fb6bbabb2bca2dfeb3b2fd8a1365b41b0a95 100644 (file)
--- 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 bfa7b7cb56dd46fcb007e817dfb75d2eb79f6bec..1b3f12803f99e061c6d943d00b507f3e6e7e2807 100644 (file)
--- 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 95a6496e8bdcd352dce4cfff807c303c70087b34..48eed3ad3516f6083a35bfaaaf7236c8e78d259a 100644 (file)
--- 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: