Discard old builds

* Most jobs will be discarded in 30 days.
* Regression jobs will be discarded after 90 days

Change-Id: Idfa3dd18465bcb88f671bc3d567d5b92ffe9d29a

16 files changed, 35 insertions, 5 deletions

diff --git a/build-gluster-org/jobs/build-job.yml b/build-gluster-org/jobs/build-job.yml
index bac9dbe..9e5b5b8 100644
--- a/build-gluster-org/jobs/build-job.yml
+++ b/build-gluster-org/jobs/build-job.yml
@@ -14,6 +14,8 @@
         wipe-workspace: true
 
     properties:
+    - discard-after-x:
+        x: 30
     - one-build-per-node
 
     triggers:
diff --git a/build-gluster-org/jobs/centos-regression-fb.yml b/build-gluster-org/jobs/centos-regression-fb.yml
index 5103493..1aae15c 100644
--- a/build-gluster-org/jobs/centos-regression-fb.yml
+++ b/build-gluster-org/jobs/centos-regression-fb.yml
@@ -13,6 +13,8 @@
         wipe-workspace: false
 
     properties:
+    - discard-after-x:
+        x: 30
     - one-build-per-node
 
     triggers:
diff --git a/build-gluster-org/jobs/centos6-regression.yml b/build-gluster-org/jobs/centos6-regression.yml
index 66c4ca4..7e4555a 100644
--- a/build-gluster-org/jobs/centos6-regression.yml
+++ b/build-gluster-org/jobs/centos6-regression.yml
@@ -15,6 +15,8 @@
         wipe-workspace: false
 
     properties:
+    - discard-after-x:
+        x: 90
     - one-build-per-node
 
     triggers:
diff --git a/build-gluster-org/jobs/comment-on-issue.yml b/build-gluster-org/jobs/comment-on-issue.yml
index fc6c333..6b661a1 100644
--- a/build-gluster-org/jobs/comment-on-issue.yml
+++ b/build-gluster-org/jobs/comment-on-issue.yml
@@ -8,6 +8,11 @@
     scm:
     - glusterfs
 
+    properties:
+    - discard-after-x:
+        x: 30
+    - one-build-per-node
+
     triggers:
     - gerrit:
         trigger-on:
diff --git a/build-gluster-org/jobs/freebsd-smoke.yml b/build-gluster-org/jobs/freebsd-smoke.yml
index f3b1d73..f57d5bc 100644
--- a/build-gluster-org/jobs/freebsd-smoke.yml
+++ b/build-gluster-org/jobs/freebsd-smoke.yml
@@ -7,6 +7,11 @@
     scm:
     - glusterfs
 
+    properties:
+    - discard-after-x:
+        x: 30
+    - one-build-per-node
+
     triggers:
     - gerrit:
         trigger-on:
diff --git a/build-gluster-org/jobs/glusterfs-devrpms.yml b/build-gluster-org/jobs/glusterfs-devrpms.yml
index d875756..0b9c604 100644
--- a/build-gluster-org/jobs/glusterfs-devrpms.yml
+++ b/build-gluster-org/jobs/glusterfs-devrpms.yml
@@ -19,7 +19,7 @@
 
     properties:
     - discard-after-x:
-        x: 50
+        x: 30
     - one-build-per-node
 
     scm:
diff --git a/build-gluster-org/jobs/glusterfs-rpms.yml b/build-gluster-org/jobs/glusterfs-rpms.yml
index d3adf2c..2190d2f 100644
--- a/build-gluster-org/jobs/glusterfs-rpms.yml
+++ b/build-gluster-org/jobs/glusterfs-rpms.yml
@@ -19,7 +19,7 @@
 
     properties:
     - discard-after-x:
-        x: 10
+        x: 30
     - one-build-per-node
 
     scm:
diff --git a/build-gluster-org/jobs/glusto-tests-lint.yml b/build-gluster-org/jobs/glusto-tests-lint.yml
index 4130f6a..68fe3f6 100644
--- a/build-gluster-org/jobs/glusto-tests-lint.yml
+++ b/build-gluster-org/jobs/glusto-tests-lint.yml
@@ -14,6 +14,8 @@
         wipe-workspace: true
 
     properties:
+    - discard-after-x:
+        x: 30
     - one-build-per-node
 
     triggers:
diff --git a/build-gluster-org/jobs/macros.yml b/build-gluster-org/jobs/macros.yml
index 6d3aff3..6a04cd1 100644
--- a/build-gluster-org/jobs/macros.yml
+++ b/build-gluster-org/jobs/macros.yml
@@ -13,9 +13,7 @@
     properties:
     - build-discarder:
         days-to-keep: '{x}'
-        num-to-keep: '{x}'
         artifact-days-to-keep: '{x}'
-        artifact-num-to-keep: '{x}'
 
 - property:
     name: one-build-per-node
diff --git a/build-gluster-org/jobs/netbsd6-smoke.yml b/build-gluster-org/jobs/netbsd6-smoke.yml
index 99b58dc..86e0774 100644
--- a/build-gluster-org/jobs/netbsd6-smoke.yml
+++ b/build-gluster-org/jobs/netbsd6-smoke.yml
@@ -9,6 +9,8 @@
     - glusterfs
 
     properties:
+    - discard-after-x:
+        x: 30
     - one-build-per-node
 
     triggers:
diff --git a/build-gluster-org/jobs/netbsd7-regression.yml b/build-gluster-org/jobs/netbsd7-regression.yml
index 88e9345..8c9fc63 100644
--- a/build-gluster-org/jobs/netbsd7-regression.yml
+++ b/build-gluster-org/jobs/netbsd7-regression.yml
@@ -9,6 +9,8 @@
     - glusterfs
 
     properties:
+    - discard-after-x:
+        x: 90
     - one-build-per-node
 
     triggers:
diff --git a/build-gluster-org/jobs/reboot-vm.yml b/build-gluster-org/jobs/reboot-vm.yml
index 3c577c0..d0a20e9 100644
--- a/build-gluster-org/jobs/reboot-vm.yml
+++ b/build-gluster-org/jobs/reboot-vm.yml
@@ -4,6 +4,10 @@
     description: "Reboot a VM in the Rackspace Cloud."
     project-type: freestyle
 
+    properties:
+    - discard-after-x:
+        x: 30
+
     parameters:
     - choice:
         choices:
diff --git a/build-gluster-org/jobs/regression-test-burn-in.yml b/build-gluster-org/jobs/regression-test-burn-in.yml
index 08e23f5..78c055e 100644
--- a/build-gluster-org/jobs/regression-test-burn-in.yml
+++ b/build-gluster-org/jobs/regression-test-burn-in.yml
@@ -13,6 +13,8 @@
         wipe-workspace: false
 
     properties:
+    - discard-after-x:
+        x: 90
     - one-build-per-node
 
     triggers:
diff --git a/build-gluster-org/jobs/regression-test-with-multiplex.yml b/build-gluster-org/jobs/regression-test-with-multiplex.yml
index e148462..9e0f545 100644
--- a/build-gluster-org/jobs/regression-test-with-multiplex.yml
+++ b/build-gluster-org/jobs/regression-test-with-multiplex.yml
@@ -13,6 +13,8 @@
         wipe-workspace: false
 
     properties:
+    - discard-after-x:
+        x: 90
     - one-build-per-node
 
     triggers:
diff --git a/build-gluster-org/jobs/smoke.yml b/build-gluster-org/jobs/smoke.yml
index 284387f..043242a 100644
--- a/build-gluster-org/jobs/smoke.yml
+++ b/build-gluster-org/jobs/smoke.yml
@@ -9,6 +9,8 @@
     - glusterfs
 
     properties:
+    - discard-after-x:
+        x: 30
     - one-build-per-node
 
     triggers:
diff --git a/build-gluster-org/jobs/strfmt_errors.yml b/build-gluster-org/jobs/strfmt_errors.yml
index 4256253..b39939f 100644
--- a/build-gluster-org/jobs/strfmt_errors.yml
+++ b/build-gluster-org/jobs/strfmt_errors.yml
@@ -7,7 +7,7 @@
 
     properties:
     - discard-after-x:
-        x: 50
+        x: 30
     - one-build-per-node
 
     scm: