Switch logrotate->build-discarder for all projects

logrotate is deprecated syntax.

Change-Id: I3a3da1c1f2c24affed085eabbcf11c7a100df91c
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index 6480aadb0ddd94cbc44bd1bfcf900cc83addb90a..b6becab679466b92cb74de21c3856df8b82cc644 100644 (file)
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -7,9 +7,9 @@
     node: centos7-autorelease-4c-16g
     jdk: '{jdk}'
 
-    logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        artifactDaysToKeep: '14'
+    properties:
+        - opendaylight-infra-properties:
+            build-days-to-keep: '30'
 
     parameters:
         - maven-exec:
@@ -103,11 +103,9 @@
     project-type: freestyle
     node: centos7-java-builder-2c-8g
 
-    logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
+    properties:
+        - opendaylight-infra-properties:
+            build-days-to-keep: '{build-days-to-keep}'
 
     parameters:
         - opendaylight-infra-parameters:

diff --git a/jjb/docs/docs-rtd.yaml b/jjb/docs/docs-rtd.yaml
index 9a24a8e4f94138b325487c2b0ccc8a83917a808c..5ad9ee2ea91223113c70889ea8243ce3621aca80 100644 (file)
--- a/jjb/docs/docs-rtd.yaml
+++ b/jjb/docs/docs-rtd.yaml
@@ -22,8 +22,9 @@
 
     project-type: freestyle
 
-    logrotate:
-        daysToKeep: 14
+    properties:
+        - opendaylight-infra-properties:
+            build-days-to-keep: 14
 
     parameters:
         - opendaylight-infra-parameters:
@@ -71,8 +72,9 @@
 
     project-type: freestyle
 
-    logrotate:
-        daysToKeep: 14
+    properties:
+        - opendaylight-infra-properties:
+            build-days-to-keep: 14
 
     parameters:
         - opendaylight-infra-parameters:

diff --git a/jjb/netvirt/netvirt-full-integration.yaml b/jjb/netvirt/netvirt-full-integration.yaml
index 032c0c6e5336df9436519c4b64e4318fcd66c0e0..56f3cccb1d842f8f55683705f06db11f68ca2c0b 100644 (file)
--- a/jjb/netvirt/netvirt-full-integration.yaml
+++ b/jjb/netvirt/netvirt-full-integration.yaml
@@ -142,11 +142,9 @@
     jdk: '{jdk}'
     description: 'Integration tests for the Netvirt project against different versions of OVS and branches. This job runs nightly. '
 
-    logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
+    properties:
+        - opendaylight-infra-properties:
+            build-days-to-keep: '{build-days-to-keep}'
 
     parameters:
         - opendaylight-infra-parameters:

diff --git a/jjb/netvirt/netvirt-sonar.yaml b/jjb/netvirt/netvirt-sonar.yaml
index 571d0d316e33ae602b6effce255dc38fcae0fa32..3fa39c53ab9b0cb4731aee916bae6e62f37eaf0c 100644 (file)
--- a/jjb/netvirt/netvirt-sonar.yaml
+++ b/jjb/netvirt/netvirt-sonar.yaml
@@ -23,11 +23,9 @@
     node: centos7-docker-2c-4g
     jdk: '{jdk}'
 
-    logrotate:
-        daysToKeep: '7'
-        numToKeep: '10'
-        artifactDaysToKeep: '1'
-        artifactNumToKeep: '1'
+    properties:
+        - opendaylight-infra-properties:
+            build-days-to-keep: 7
 
     parameters:
         - opendaylight-infra-parameters:

diff --git a/jjb/neutron/neutron-daily-openstack-beryllium.yaml b/jjb/neutron/neutron-daily-openstack-beryllium.yaml
index f2da9c918ce9b54c15c41bb23e2c9bc4abd99176..e29e017053cf3d96eeeff7aec39bf5924bb1717f 100644 (file)
--- a/jjb/neutron/neutron-daily-openstack-beryllium.yaml
+++ b/jjb/neutron/neutron-daily-openstack-beryllium.yaml
@@ -14,8 +14,9 @@
     description: 'Jenkins job to run Tempest tests for the ODL ML2 MechanismDriver on Neutron dummy provider. '
     concurrent: true
 
-    logrotate:
-        daysToKeep: '198'
+    properties:
+        - opendaylight-infra-properties:
+            build-days-to-keep: '198'
 
     parameters:
         - opendaylight-infra-parameters:

diff --git a/jjb/opflex/opflex-custom.yaml b/jjb/opflex/opflex-custom.yaml
index 294e3fb7356a04fb7149986c1c23e3f17c82c765..73af4d97f23508ece216532b1e6c4ccf8800de51 100644 (file)
--- a/jjb/opflex/opflex-custom.yaml
+++ b/jjb/opflex/opflex-custom.yaml
@@ -46,11 +46,9 @@
     concurrent: true
     jdk: '{jdk}'
 
-    logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
+    properties:
+        - opendaylight-infra-properties:
+            build-days-to-keep: '{build-days-to-keep}'
 
     parameters:
         - opendaylight-infra-parameters:
@@ -93,11 +91,9 @@
     node: centos7-java-builder-2c-8g
     jdk: '{jdk}'
 
-    logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
+    properties:
+        - opendaylight-infra-properties:
+            build-days-to-keep: '{build-days-to-keep}'
 
     parameters:
         - opendaylight-infra-parameters:

diff --git a/jjb/opflex/opflex-dependencies.yaml b/jjb/opflex/opflex-dependencies.yaml
index 87ccc1f1093772d1b1c817ea707fe1fe310f4397..c54116c95915e131c1dfb63e2cf543c54b6150ad 100644 (file)
--- a/jjb/opflex/opflex-dependencies.yaml
+++ b/jjb/opflex/opflex-dependencies.yaml
@@ -101,11 +101,9 @@
     node: centos7-java-builder-2c-8g
     concurrent: true
 
-    logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
+    properties:
+        - opendaylight-infra-properties:
+            build-days-to-keep: '{build-days-to-keep}'
 
     scm:
         - git-opflex-libuv-{libuv-scm}
@@ -138,11 +136,9 @@
     node: centos7-java-builder-2c-8g
     concurrent: true
 
-    logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
+    properties:
+        - opendaylight-infra-properties:
+            build-days-to-keep: '{build-days-to-keep}'
 
     scm:
         - git-opflex-rapidjson-{rapidjson-scm}
@@ -182,11 +178,9 @@
     node: centos7-java-builder-2c-8g
     concurrent: true
 
-    logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
+    properties:
+        - opendaylight-infra-properties:
+            build-days-to-keep: '{build-days-to-keep}'
 
     scm:
         - git-opflex-ovs-{openvswitch-scm}

diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml
index 7e376f7b57c648b3f3c6b51ea1fea4c859e3306e..7971adcda7a6b433ccd20849cc7a2553bbb4feb0 100644 (file)
--- a/jjb/ovsdb/ovsdb-full-integration.yaml
+++ b/jjb/ovsdb/ovsdb-full-integration.yaml
@@ -108,11 +108,9 @@
     jdk: '{jdk}'
     description: 'Integration tests for the OVSDB project against different versions of OVS and branches. This job runs nightly. '
 
-    logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
+    properties:
+        - opendaylight-infra-properties:
+            build-days-to-keep: '{build-days-to-keep}'
 
     parameters:
         - opendaylight-infra-parameters:

diff --git a/jjb/ovsdb/ovsdb-sonar.yaml b/jjb/ovsdb/ovsdb-sonar.yaml
index 571251ea99830500c2150aa518d2c6a48c52efc4..67e97b3c638b4cdccd915bfb27a9e28f1e3eb80b 100644 (file)
--- a/jjb/ovsdb/ovsdb-sonar.yaml
+++ b/jjb/ovsdb/ovsdb-sonar.yaml
@@ -13,11 +13,9 @@
     node: centos7-docker-2c-4g
     jdk: '{jdk}'
 
-    logrotate:
-        daysToKeep: '7'
-        numToKeep: '10'
-        artifactDaysToKeep: '1'
-        artifactNumToKeep: '1'
+    properties:
+        - opendaylight-infra-properties:
+            build-days-to-keep: 7
 
     parameters:
         - opendaylight-infra-parameters:

diff --git a/jjb/packaging/packaging.yaml b/jjb/packaging/packaging.yaml
index 99841c6080683bde10602e8970f87e7c7cebf45e..8ea0e98cf0ecf3043b6eb02b6a4fa2e9df2b9f4f 100644 (file)
--- a/jjb/packaging/packaging.yaml
+++ b/jjb/packaging/packaging.yaml
@@ -17,8 +17,9 @@
 
     node: dynamic_verify
 
-    logrotate:
-        daysToKeep: '7'
+    properties:
+        - opendaylight-infra-properties:
+            build-days-to-keep: 7
 
     parameters:
         - opendaylight-infra-parameters:

diff --git a/jjb/sfc/sfc-python.yaml b/jjb/sfc/sfc-python.yaml
index cd1849e8db9795f202e81d224a517b2e6baab001..7a3b3f87424c3c9060127f222337fb637831a35b 100644 (file)
--- a/jjb/sfc/sfc-python.yaml
+++ b/jjb/sfc/sfc-python.yaml
@@ -30,11 +30,9 @@
     node: centos7-java-builder-2c-8g
     concurrent: true
 
-    logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
+    properties:
+        - opendaylight-infra-properties:
+            build-days-to-keep: '{build-days-to-keep}'
 
     parameters:
         - opendaylight-infra-parameters:

diff --git a/jjb/spectrometer/spectrometer-jobs.yaml b/jjb/spectrometer/spectrometer-jobs.yaml
index c8bff2e7ca1d52a933b1e5ada1455ef7767572cf..4e0e0601532f9d052ddf4f6460f0c48fedd3720e 100644 (file)
--- a/jjb/spectrometer/spectrometer-jobs.yaml
+++ b/jjb/spectrometer/spectrometer-jobs.yaml
@@ -25,9 +25,9 @@
     node: dynamic_verify
     concurrent: false
 
-    logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+    properties:
+        - opendaylight-infra-properties:
+            build-days-to-keep: '{build-days-to-keep}'
 
     wrappers:
         - build-timeout