Merge "Switch to build-discarder property for logrotate"

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index 0d63fb01cbe09a8b5634127a876b07e2bb710234..392b0c3866e3ccab79d0085d7897125d10de2aaf 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -53,8 +53,9 @@
 
     project-type: freestyle
 
-    logrotate:
-        daysToKeep: 14
+    properties:
+        - opendaylight-infra-properties:
+            build-days-to-keep: 14
 
     parameters:
         - opendaylight-infra-parameters:
@@ -103,8 +104,9 @@
 
     project-type: freestyle
 
-    logrotate:
-        daysToKeep: 14
+    properties:
+        - opendaylight-infra-properties:
+            build-days-to-keep: 14
 
     parameters:
         - opendaylight-infra-parameters:
@@ -156,8 +158,9 @@
 
     project-type: freestyle
 
-    logrotate:
-        daysToKeep: 14
+    properties:
+        - opendaylight-infra-properties:
+            build-days-to-keep: 14
 
     parameters:
         - opendaylight-infra-parameters:
@@ -217,8 +220,9 @@
 
     project-type: freestyle
 
-    logrotate:
-        daysToKeep: 14
+    properties:
+        - opendaylight-infra-properties:
+            build-days-to-keep: 14
 
     parameters:
         - opendaylight-infra-parameters:
@@ -255,8 +259,9 @@
 
     project-type: freestyle
 
-    logrotate:
-        daysToKeep: 14
+    properties:
+        - opendaylight-infra-properties:
+            build-days-to-keep: 14
 
     parameters:
         - opendaylight-infra-parameters:
@@ -290,8 +295,9 @@
     node: centos7-java-builder-2c-8g
     concurrent: true
 
-    logrotate:
-        daysToKeep: 14
+    properties:
+        - opendaylight-infra-properties:
+            build-days-to-keep: 14
 
     parameters:
         - opendaylight-infra-parameters:
@@ -334,8 +340,9 @@
     node: centos7-java-builder-2c-8g
     concurrent: true
 
-    logrotate:
-        daysToKeep: 14
+    properties:
+        - opendaylight-infra-properties:
+            build-days-to-keep: 14
 
     parameters:
         - opendaylight-infra-parameters:

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index 802247b97ce01d653561e5a4387c3cdbaa2f80ab..eab86572f7b63d9e5cde20994ef81e1fdcdccdd7 100644 (file)
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -1,5 +1,11 @@
 # OLD Releng macros
 
+- property:
+    name: opendaylight-infra-properties
+    properties:
+        - build-discarder:
+            days-to-keep: '{build-days-to-keep}'
+
 - parameter:
     name: opendaylight-infra-parameters
     parameters: