From 29be786d3165364f61fadadf0fba430c2f377018 Mon Sep 17 00:00:00 2001 From: Eric Ball Date: Fri, 28 Sep 2018 18:47:56 -0700 Subject: [PATCH] Remove all logrotate calls These are deprecated, and were causing a warning from jjb. All logrotate calls have been replaced with build-discarder. Change-Id: Ic84be4c8b3500039e3a9c5a1ce7c8ce4d853614d Signed-off-by: Eric Ball --- jjb/ci-management/ci-management-jobs.yaml | 4 +-- jjb/cicn/cicn.yaml | 60 +++++++++++++++---------------- jjb/csit/csit-hc2vpp.yaml | 4 +-- jjb/csit/csit-vpp-pylint.yaml | 2 +- jjb/csit/csit.yaml | 48 ++++++++++++------------- jjb/deb_dpdk/deb_dpdk.yaml | 6 ++-- jjb/dmm/dmm.yaml | 8 ++--- jjb/hc2vpp/hc2vpp-csit.yaml | 10 +++--- jjb/hc2vpp/hc2vpp.yaml | 8 ++--- jjb/honeycomb/honeycomb.yaml | 10 +++--- jjb/nsh_sfc/nsh_sfc.yaml | 16 ++++----- jjb/puppet-fdio/puppet-fdio.yaml | 4 +-- jjb/rpm_dpdk/rpm_dpdk.yaml | 7 ++-- jjb/tldk/tldk.yaml | 8 ++--- jjb/trex/trex.yaml | 4 +-- jjb/vpp/docs.yaml | 12 +++---- jjb/vpp/vpp-opensuse.yaml | 8 ++--- jjb/vpp/vpp.yaml | 21 ++++++----- 18 files changed, 119 insertions(+), 121 deletions(-) diff --git a/jjb/ci-management/ci-management-jobs.yaml b/jjb/ci-management/ci-management-jobs.yaml index 0139f164a..291309a85 100644 --- a/jjb/ci-management/ci-management-jobs.yaml +++ b/jjb/ci-management/ci-management-jobs.yaml @@ -24,7 +24,7 @@ node: jjb concurrent: true - logrotate: + build-discarder: daysToKeep: 30 numToKeep: 10 artifactDaysToKeep: -1 @@ -68,7 +68,7 @@ project-type: freestyle node: jjb - logrotate: + build-discarder: daysToKeep: 30 numToKeep: 40 artifactDaysToKeep: -1 diff --git a/jjb/cicn/cicn.yaml b/jjb/cicn/cicn.yaml index 507415adb..b941791f4 100644 --- a/jjb/cicn/cicn.yaml +++ b/jjb/cicn/cicn.yaml @@ -269,7 +269,7 @@ project-type: freestyle node: '{os}-basebuild-4c-4g' - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -352,7 +352,7 @@ node: '{os}-basebuild-4c-4g' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -403,7 +403,7 @@ node: ubuntu1604-basebuild-8c-32g concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -481,7 +481,7 @@ node: ubuntu1604-basebuild-8c-32g concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -542,7 +542,7 @@ project-type: freestyle node: '{os}-basebuild-4c-4g' - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -618,7 +618,7 @@ node: '{os}-basebuild-4c-4g' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -669,7 +669,7 @@ node: ubuntu1604-basebuild-8c-32g concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -747,7 +747,7 @@ node: ubuntu1604-basebuild-8c-32g concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -809,7 +809,7 @@ project-type: freestyle node: '{os}-basebuild-4c-4g' - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -882,7 +882,7 @@ node: '{os}-basebuild-4c-4g' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -932,7 +932,7 @@ project-type: freestyle node: '{os}-basebuild-4c-4g' - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -1005,7 +1005,7 @@ node: '{os}-basebuild-4c-4g' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -1055,7 +1055,7 @@ project-type: freestyle node: '{os}-basebuild-4c-4g' - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -1128,7 +1128,7 @@ node: '{os}-basebuild-4c-4g' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -1178,7 +1178,7 @@ project-type: freestyle node: '{os}-basebuild-4c-4g' - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -1251,7 +1251,7 @@ node: '{os}-basebuild-4c-4g' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -1301,7 +1301,7 @@ project-type: freestyle node: '{os}-basebuild-4c-4g' - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -1374,7 +1374,7 @@ node: '{os}-basebuild-4c-4g' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -1424,7 +1424,7 @@ project-type: freestyle node: '{os}-basebuild-4c-4g' - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -1497,7 +1497,7 @@ node: '{os}-basebuild-4c-4g' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -1547,7 +1547,7 @@ project-type: freestyle node: '{os}-basebuild-4c-4g' - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -1618,7 +1618,7 @@ node: '{os}-basebuild-4c-4g' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -1668,7 +1668,7 @@ project-type: freestyle node: '{os}-basebuild-4c-4g' - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -1741,7 +1741,7 @@ node: '{os}-basebuild-4c-4g' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -1791,7 +1791,7 @@ project-type: freestyle node: '{os}-basebuild-4c-4g' - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -1862,7 +1862,7 @@ node: '{os}-basebuild-4c-4g' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -1912,7 +1912,7 @@ project-type: freestyle node: '{os}-basebuild-4c-4g' - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -1969,7 +1969,7 @@ node: '{os}-basebuild-4c-4g' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -2019,7 +2019,7 @@ project-type: freestyle node: '{os}-basebuild-4c-4g' - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -2090,7 +2090,7 @@ node: '{os}-basebuild-4c-4g' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' diff --git a/jjb/csit/csit-hc2vpp.yaml b/jjb/csit/csit-hc2vpp.yaml index 83306bc89..c58a27e75 100644 --- a/jjb/csit/csit-hc2vpp.yaml +++ b/jjb/csit/csit-hc2vpp.yaml @@ -28,7 +28,7 @@ node: '{os}-basebuild-4c-4g' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -85,7 +85,7 @@ node: 'ubuntu1604-basebuild-4c-4g' concurrent: false - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' diff --git a/jjb/csit/csit-vpp-pylint.yaml b/jjb/csit/csit-vpp-pylint.yaml index c30667ff8..f8a521120 100644 --- a/jjb/csit/csit-vpp-pylint.yaml +++ b/jjb/csit/csit-vpp-pylint.yaml @@ -17,7 +17,7 @@ node: ubuntu1604-basebuild-4c-4g concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml index 1cd4ccefa..ad5d618ba 100644 --- a/jjb/csit/csit.yaml +++ b/jjb/csit/csit.yaml @@ -84,7 +84,7 @@ node: '{os}-basebuild-4c-4g' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -167,7 +167,7 @@ node: 'ubuntu1604-basebuild-4c-4g' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -270,7 +270,7 @@ node: 'ubuntu1804-basebuild-4c-4g' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -339,7 +339,7 @@ node: '{os}-basebuild-4c-4g' concurrent: false - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -391,7 +391,7 @@ node: '{os}-basebuild-4c-4g' concurrent: false - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -441,7 +441,7 @@ node: centos7-basebuild-4c-4g' concurrent: false - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -495,7 +495,7 @@ node: 'ubuntu1604-basebuild-4c-4g' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -556,7 +556,7 @@ node: 'ubuntu1604-basebuild-4c-4g' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -633,7 +633,7 @@ node: 'ubuntu1604-basebuild-8c-32g' concurrent: false - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -707,7 +707,7 @@ node: 'ubuntu1604-basebuild-8c-32g' concurrent: false - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -794,7 +794,7 @@ node: 'ubuntu1604-basebuild-4c-4g' concurrent: false - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -857,7 +857,7 @@ node: 'ubuntu1604-basebuild-4c-4g' concurrent: false - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -920,7 +920,7 @@ node: 'ubuntu1604-basebuild-4c-4g' concurrent: false - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -984,7 +984,7 @@ node: 'ubuntu1604-basebuild-4c-4g' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -1052,7 +1052,7 @@ node: 'ubuntu1604-basebuild-4c-4g' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -1120,7 +1120,7 @@ node: 'ubuntu1604-basebuild-4c-4g' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -1188,7 +1188,7 @@ node: 'ubuntu1604-basebuild-4c-4g' concurrent: false - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -1256,7 +1256,7 @@ node: 'ubuntu1604-basebuild-4c-4g' concurrent: false - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -1324,7 +1324,7 @@ node: 'ubuntu1604-basebuild-4c-4g' concurrent: false - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -1414,7 +1414,7 @@ node: 'ubuntu1604-basebuild-8c-32g' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -1481,7 +1481,7 @@ node: 'ubuntu1604-basebuild-4c-4g' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -1535,7 +1535,7 @@ node: '{os}-basebuild-4c-4g' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -1589,7 +1589,7 @@ node: '{os}-basebuild-4c-4g' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -1641,7 +1641,7 @@ node: 'ubuntu1604-basebuild-4c-4g' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' diff --git a/jjb/deb_dpdk/deb_dpdk.yaml b/jjb/deb_dpdk/deb_dpdk.yaml index d0d0237cd..3a95ff1d2 100644 --- a/jjb/deb_dpdk/deb_dpdk.yaml +++ b/jjb/deb_dpdk/deb_dpdk.yaml @@ -43,7 +43,7 @@ node: '{os}-basebuild-4c-4g' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -90,7 +90,7 @@ node: '{os}-basebuild-4c-4g' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -149,7 +149,7 @@ project-type: freestyle node: '{os}-basebuild-4c-4g' - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' diff --git a/jjb/dmm/dmm.yaml b/jjb/dmm/dmm.yaml index 3a94a13a2..054350c51 100644 --- a/jjb/dmm/dmm.yaml +++ b/jjb/dmm/dmm.yaml @@ -37,7 +37,7 @@ node: '{os}-basebuild-4c-4g' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -81,7 +81,7 @@ node: '{os}-basebuild-4c-4g' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -124,7 +124,7 @@ project-type: freestyle node: '{os}-basebuild-4c-4g' - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -168,7 +168,7 @@ node: '{os}-basebuild-4c-4g' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' diff --git a/jjb/hc2vpp/hc2vpp-csit.yaml b/jjb/hc2vpp/hc2vpp-csit.yaml index b3dd54099..c95d63d53 100644 --- a/jjb/hc2vpp/hc2vpp-csit.yaml +++ b/jjb/hc2vpp/hc2vpp-csit.yaml @@ -52,7 +52,7 @@ node: '{os}-basebuild-4c-4g' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -105,7 +105,7 @@ jdk: openjdk8-{os} concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -196,7 +196,7 @@ node: '{os}-basebuild-4c-4g' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -251,7 +251,7 @@ jdk: openjdk8-{os} concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -342,7 +342,7 @@ node: '{os}-basebuild-4c-4g' concurrent: false - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' diff --git a/jjb/hc2vpp/hc2vpp.yaml b/jjb/hc2vpp/hc2vpp.yaml index 1fb37feb4..0148dab13 100644 --- a/jjb/hc2vpp/hc2vpp.yaml +++ b/jjb/hc2vpp/hc2vpp.yaml @@ -37,7 +37,7 @@ concurrent: true jdk: openjdk8-{os} - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -89,7 +89,7 @@ concurrent: true jdk: openjdk8-{os} - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -153,7 +153,7 @@ node: '{os}-basebuild-4c-4g' jdk: openjdk8-{os} - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -218,7 +218,7 @@ node: '{os}-basebuild-4c-4g' jdk: openjdk8-{os} - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' diff --git a/jjb/honeycomb/honeycomb.yaml b/jjb/honeycomb/honeycomb.yaml index d1e0cde34..553651ac6 100644 --- a/jjb/honeycomb/honeycomb.yaml +++ b/jjb/honeycomb/honeycomb.yaml @@ -8,7 +8,7 @@ project: 'honeycomb' os: 'ubuntu1604' repo-os-part: 'ubuntu.xenial.main' - + stream: - master: branch: 'master' @@ -30,7 +30,7 @@ concurrent: true jdk: openjdk8-{os} - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -81,7 +81,7 @@ node: '{os}-basebuild-4c-4g' jdk: openjdk8-{os} - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -159,10 +159,10 @@ - job-template: name: 'honeycomb-benchmark-master' project-type: maven - node: ubuntu1604-basebuild-4c-4g + node: ubuntu1604-basebuild-4c-4g jdk: openjdk8-ubuntu1604 - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' diff --git a/jjb/nsh_sfc/nsh_sfc.yaml b/jjb/nsh_sfc/nsh_sfc.yaml index 92953495c..d23efe893 100644 --- a/jjb/nsh_sfc/nsh_sfc.yaml +++ b/jjb/nsh_sfc/nsh_sfc.yaml @@ -76,7 +76,7 @@ concurrent: true jdk: openjdk8-{os} - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -145,7 +145,7 @@ node: '{os}-basebuild-4c-4g' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -226,7 +226,7 @@ node: '{os}-basebuild-4c-4g' jdk: openjdk8-{os} - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -295,7 +295,7 @@ node: '{os}-basebuild-4c-4g' jdk: openjdk8-{os} - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -380,7 +380,7 @@ concurrent: true jdk: openjdk8-ubuntu1604 - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -437,7 +437,7 @@ concurrent: true jdk: openjdk8-{os} - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -514,7 +514,7 @@ node: 'ubuntu1604-basebuild-4c-4g' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -568,7 +568,7 @@ node: '{os}-basebuild-4c-4g' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' diff --git a/jjb/puppet-fdio/puppet-fdio.yaml b/jjb/puppet-fdio/puppet-fdio.yaml index b6a6a7350..b65d5e2e5 100644 --- a/jjb/puppet-fdio/puppet-fdio.yaml +++ b/jjb/puppet-fdio/puppet-fdio.yaml @@ -20,7 +20,7 @@ node: centos7-basebuild-4c-4g concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -74,7 +74,7 @@ node: centos7-basebuild-4c-4g concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' diff --git a/jjb/rpm_dpdk/rpm_dpdk.yaml b/jjb/rpm_dpdk/rpm_dpdk.yaml index aa11677e4..6ccb73722 100644 --- a/jjb/rpm_dpdk/rpm_dpdk.yaml +++ b/jjb/rpm_dpdk/rpm_dpdk.yaml @@ -21,7 +21,7 @@ node: '{os}-basebuild-4c-4g' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -68,7 +68,7 @@ node: '{os}-basebuild-4c-4g' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -126,7 +126,7 @@ project-type: freestyle node: '{os}-basebuild-4c-4g' - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -182,4 +182,3 @@ publishers: - fdio-infra-shiplogs: maven-version: 'mvn33-new' - diff --git a/jjb/tldk/tldk.yaml b/jjb/tldk/tldk.yaml index 41e1b5469..3939220f9 100644 --- a/jjb/tldk/tldk.yaml +++ b/jjb/tldk/tldk.yaml @@ -34,7 +34,7 @@ node: '{os}-basebuild-4c-4g' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -82,7 +82,7 @@ node: '{os}-basebuild-4c-4g' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -142,7 +142,7 @@ project-type: freestyle node: '{os}-basebuild-4c-4g' - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -190,7 +190,7 @@ node: '{os}-basebuild-4c-4g' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' diff --git a/jjb/trex/trex.yaml b/jjb/trex/trex.yaml index 4b7d7b54a..a81577d63 100644 --- a/jjb/trex/trex.yaml +++ b/jjb/trex/trex.yaml @@ -22,7 +22,7 @@ node: '{os}-basebuild-4c-4g' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -66,7 +66,7 @@ node: '{os}-basebuild-4c-4g' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' diff --git a/jjb/vpp/docs.yaml b/jjb/vpp/docs.yaml index 65fd996d1..cf25ad19f 100644 --- a/jjb/vpp/docs.yaml +++ b/jjb/vpp/docs.yaml @@ -39,7 +39,7 @@ node: ubuntu1604-us concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -108,7 +108,7 @@ node: ubuntu1604-us concurrent: false - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -194,7 +194,7 @@ node: ubuntu1604-us concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -264,7 +264,7 @@ node: ubuntu1604-us concurrent: false - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -340,7 +340,7 @@ node: ubuntu1604-us concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -409,7 +409,7 @@ node: ubuntu1604-us concurrent: false - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' diff --git a/jjb/vpp/vpp-opensuse.yaml b/jjb/vpp/vpp-opensuse.yaml index 2681455aa..425b6f6d7 100644 --- a/jjb/vpp/vpp-opensuse.yaml +++ b/jjb/vpp/vpp-opensuse.yaml @@ -42,7 +42,7 @@ node: 'opensuse-us' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: 100 artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -104,7 +104,7 @@ node: 'osleap15-us' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: 100 artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -165,7 +165,7 @@ project-type: freestyle node: 'opensuse-us' - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: 100 artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -259,7 +259,7 @@ project-type: freestyle node: 'osleap15-us' - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: 100 artifactDaysToKeep: '{build-artifact-days-to-keep}' diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index 9bdac1b3f..f160cc442 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -128,7 +128,7 @@ name: '{project}' branch: '{branch}' - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: 100 artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -184,7 +184,7 @@ project-type: freestyle node: '{os}-us' - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: 100 artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -272,7 +272,7 @@ node: '{os}arm-us' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: 100 artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -330,7 +330,7 @@ project-type: freestyle node: '{os}arm-us' - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: 100 artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -417,7 +417,7 @@ node: '{os}-us' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -509,7 +509,7 @@ node: '{os}-us' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: 100 artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -571,7 +571,7 @@ node: 'ubuntu1604-us' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -626,7 +626,7 @@ project-type: freestyle node: '{os}-us' - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: 100 artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -719,7 +719,7 @@ node: '{os}-us' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: 100 artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -788,7 +788,7 @@ node: '{os}-basebuild-8c-32g' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: 100 artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -870,4 +870,3 @@ name: TYPE default: '{type}' description: "TYPE parameter if not given by trigger" - -- 2.16.6