From: Alfredo Deza <adeza@redhat.com>
Date: Wed, 12 Sep 2018 11:27:58 +0000 (-0400)
Subject: Change build discard options for ceph and ceph-volume jobs
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ec18d8b1589cbedd69fece1dff3ed0249f09faa6;p=ceph-build.git

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 a483abe0..8487aea0 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
@@ -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 8a8df2ed..a28ad3b1 100644
--- 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 623a57d9..6e72e26a 100644
--- 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 5b12628a..c2b7fc2f 100644
--- 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 dba4f4dc..5fa14c14 100644
--- 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