Change build discard options for ceph and ceph-volume jobs

So that it isn't limited by the number, it is limited by days only. This
will allow builds to avoid 404'ing when the limit is reached, which is
unexpected if there are too many builds and not long enough time between
them (like 100 builds in one day, but limit is 20 before discarding)

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

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 a483abe0530d9560a4b10607fecebf97889bce6c..8487aea0950a7c83d7a3ffa6d9bd3f640bd16a37 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
@@ -11,8 +11,7 @@
     block-upstream: false
     properties:
       - build-discarder:
-          days-to-keep: 1
-          num-to-keep: 10
+          days-to-keep: 15
           artifact-days-to-keep: -1
           artifact-num-to-keep: -1
       - github:

diff --git a/ceph-pr-commits/config/definitions/ceph-pr-commits.yml b/ceph-pr-commits/config/definitions/ceph-pr-commits.yml
index 8a8df2ed9350a28ab510424aad075b367d18a7dc..a28ad3b1cd564e984b6dac8361c8816b6fe82fee 100644 (file)
--- a/ceph-pr-commits/config/definitions/ceph-pr-commits.yml
+++ b/ceph-pr-commits/config/definitions/ceph-pr-commits.yml
@@ -40,9 +40,7 @@
     properties:
       - build-discarder:
           days-to-keep: 15
-          num-to-keep: 30
-          artifact-days-to-keep: -1
-          artifact-num-to-keep: -1
+          artifact-days-to-keep: 15
       - github:
           url: https://github.com/ceph/ceph/
 

diff --git a/ceph-pr-submodules/config/definitions/ceph-pr-commits.yml b/ceph-pr-submodules/config/definitions/ceph-pr-commits.yml
index 623a57d96cce3f56ac27b79ce2817ba75b3e635f..6e72e26a226d89b29498e675775e90ac865c23b9 100644 (file)
--- a/ceph-pr-submodules/config/definitions/ceph-pr-commits.yml
+++ b/ceph-pr-submodules/config/definitions/ceph-pr-commits.yml
@@ -12,7 +12,6 @@
     properties:
       - build-discarder:
           days-to-keep: 15
-          num-to-keep: 30
           artifact-days-to-keep: -1
           artifact-num-to-keep: -1
       - github:

diff --git a/ceph-volume-scenario/config/definitions/ceph-volume-scenario.yml b/ceph-volume-scenario/config/definitions/ceph-volume-scenario.yml
index 5b12628a350ff8a4cf08e2f95e301a3d22ed15e3..c2b7fc2f3ff769f5a445a409b2662f3ea2437794 100644 (file)
--- a/ceph-volume-scenario/config/definitions/ceph-volume-scenario.yml
+++ b/ceph-volume-scenario/config/definitions/ceph-volume-scenario.yml
@@ -12,9 +12,7 @@
     properties:
       - build-discarder:
           days-to-keep: 15
-          num-to-keep: 30
-          artifact-days-to-keep: -1
-          artifact-num-to-keep: -1
+          artifact-days-to-keep: 15
       - github:
           url: https://github.com/ceph/ceph
 

diff --git a/ceph-volume-test/config/definitions/ceph-volume-test.yml b/ceph-volume-test/config/definitions/ceph-volume-test.yml
index dba4f4dcb4b2e6f6c31e35f39ec48d29804c4c80..5fa14c1424db4647375194baf396503275d52081 100644 (file)
--- a/ceph-volume-test/config/definitions/ceph-volume-test.yml
+++ b/ceph-volume-test/config/definitions/ceph-volume-test.yml
@@ -9,10 +9,8 @@
     concurrent: true
     properties:
       - build-discarder:
-          days-to-keep: 90
-          num-to-keep: 25
-          artifact-days-to-keep: 25
-          artifact-num-to-keep: 25
+          days-to-keep: 20
+          artifact-num-to-keep: 20
       - github:
           url: https://github.com/ceph/ceph