jjb: use default logrotate setting in all projects

Many projects have own logrotate definitions copied from the template.
This patch make sure all projects to use the default logrotate setting,
so that the infra admin can configure the values easily.

This patch also fixes the logrotate rule for artifacts to keep them
in the same duration as console logs exist. Note, this won't effect
the hold time of artifacts in artifact.opnfv.org .

Change-Id: I708a675c7e87e5f830ee36009f0c6913c003b2ed
Signed-off-by: Ryota MIBU <r-mibu@cq.jp.nec.com>

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 5db7613..f51b656 100644 (file)
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -24,12 +24,6 @@
 
     node: opnfv-jump-1
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     parameters:
         - apex-parameter:
             gs-pathname: '{gs-pathname}'

diff --git a/jjb/armband/armband.yml b/jjb/armband/armband.yml
index cb5dc95..47906b7 100644 (file)
--- a/jjb/armband/armband.yml
+++ b/jjb/armband/armband.yml
@@ -18,12 +18,6 @@
 - job-template:
     name: armband-test
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     builders:
         - shell: |
             echo "Hello world from armband"
@@ -69,12 +63,6 @@
 
     node: ericsson-build
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     parameters:
         - project-parameter:
             project: '{project}'

diff --git a/jjb/availability/availability.yml b/jjb/availability/availability.yml
index 741fd82..e8fb430 100644 (file)
--- a/jjb/availability/availability.yml
+++ b/jjb/availability/availability.yml
@@ -18,12 +18,6 @@
 - job-template:
     name: availability-test
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     builders:
         - shell: |
             echo "Hello world from availability"
@@ -65,12 +59,6 @@
 - job-template:
     name: 'availability-verify'
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     parameters:
         - project-parameter:
             project: '{project}'

diff --git a/jjb/bottlenecks/bottlenecks.yml b/jjb/bottlenecks/bottlenecks.yml
index b2d74eb..e775865 100644 (file)
--- a/jjb/bottlenecks/bottlenecks.yml
+++ b/jjb/bottlenecks/bottlenecks.yml
@@ -32,12 +32,6 @@
 - job-template:
     name: 'bottlenecks-test'
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     builders:
         - shell: |
             echo "Hello world from bottlenecks"
@@ -46,12 +40,6 @@
 
     name: 'bottlenecks-verify'
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     parameters:
         - project-parameter:
             project: '{project}'
@@ -93,12 +81,6 @@
     #
     # This job's purpose is to update all the JJB
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 40
-        artifactDaysToKeep: -1
-        artifactNumToKeep: 5
-
     parameters:
         - project-parameter:
             project: '{project}'
@@ -158,12 +140,6 @@
             refspec: ''
             branch: '{branch}'
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     triggers:
         - 'bottlenecks-trigger-{pod}'
 

diff --git a/jjb/compass4nfv/compass4nfv.yml b/jjb/compass4nfv/compass4nfv.yml
index 74f9a45..2b279bd 100644 (file)
--- a/jjb/compass4nfv/compass4nfv.yml
+++ b/jjb/compass4nfv/compass4nfv.yml
@@ -51,12 +51,6 @@
             max-total: 3
             max-per-node: 1
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     parameters:
         - project-parameter:
             project: '{project}'
@@ -180,12 +174,6 @@
     triggers:
         - timed: '@midnight'
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     builders:
         - trigger-builds:
           - project: 'compass-build-iso'
@@ -217,12 +205,6 @@
             max-total: 1
             max-per-node: 1
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     parameters:
         - project-parameter:
             project: '{project}'
@@ -255,12 +237,6 @@
             max-total: 1
             max-per-node: 1
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     parameters:
         - project-parameter:
             project: '{project}'
@@ -304,12 +280,6 @@
             default: '{conf}'
             description: ""
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     builders:
         - 'builder-compass-ci-preclean-workspace'
         - 'builder-compass-download-artifact'
@@ -341,12 +311,6 @@
         - compass-parameter:
             installer: '{installer}'
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     builders:
         - 'builder-compass-ci-preclean-workspace'
         - 'builder-compass-download-artifact'

diff --git a/jjb/conductor/conductor.yml b/jjb/conductor/conductor.yml
index 5d1e578..3316a4a 100644 (file)
--- a/jjb/conductor/conductor.yml
+++ b/jjb/conductor/conductor.yml
@@ -18,12 +18,6 @@
 - job-template:
     name: conductor-test
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     builders:
         - shell: |
             echo "Hello world from conductor"
@@ -67,12 +61,6 @@
 - job-template:
     name: 'conductor-verify'
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     parameters:
         - project-parameter:
             project: '{project}'

diff --git a/jjb/copper/copper.yml b/jjb/copper/copper.yml
index 47651b2..637e359 100644 (file)
--- a/jjb/copper/copper.yml
+++ b/jjb/copper/copper.yml
@@ -15,12 +15,6 @@
 - job-template:
     name: copper-test
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     builders:
         - shell: |
             echo "Hello world from copper"

diff --git a/jjb/dpacc/dpacc.yml b/jjb/dpacc/dpacc.yml
index 0a4e6e4..27f298c 100644 (file)
--- a/jjb/dpacc/dpacc.yml
+++ b/jjb/dpacc/dpacc.yml
@@ -18,12 +18,6 @@
 - job-template:
     name: dpacc-test
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     builders:
         - shell: |
             echo "Hello world from dpacc"
@@ -67,12 +61,6 @@
 - job-template:
     name: 'dpacc-verify'
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     parameters:
         - project-parameter:
             project: '{project}'

diff --git a/jjb/fastpathmetrics/fastpathmetrics.yml b/jjb/fastpathmetrics/fastpathmetrics.yml
index 1915976..fbe8f0b 100644 (file)
--- a/jjb/fastpathmetrics/fastpathmetrics.yml
+++ b/jjb/fastpathmetrics/fastpathmetrics.yml
@@ -18,12 +18,6 @@
 - job-template:
     name: fastpathmetrics-test
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     builders:
         - shell: |
             echo "Hello world from fastpathmetrics"
@@ -67,12 +61,6 @@
 - job-template:
     name: 'fastpathmetrics-verify'
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     parameters:
         - project-parameter:
             project: '{project}'

diff --git a/jjb/fuel/fuel.yml b/jjb/fuel/fuel.yml
index 97fc9ed..f00da7c 100644 (file)
--- a/jjb/fuel/fuel.yml
+++ b/jjb/fuel/fuel.yml
@@ -39,12 +39,6 @@
             enabled: true
             max-total: 3
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     parameters:
         - project-parameter:
             project: '{project}'
@@ -266,12 +260,6 @@
 
     node: ericsson-build
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     parameters:
         - project-parameter:
             project: '{project}'
@@ -326,12 +314,6 @@
             refspec: ''
             branch: '{branch}'
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     builders:
         - shell:
             !include-raw ./fuel-download-artifact.sh
@@ -347,12 +329,6 @@
 
     disabled: true
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     parameters:
         - project-parameter:
             project: '{project}'

diff --git a/jjb/functest/functest.yml b/jjb/functest/functest.yml
index f911d95..4223e67 100644 (file)
--- a/jjb/functest/functest.yml
+++ b/jjb/functest/functest.yml
@@ -68,12 +68,6 @@
 
     node: '{pod}'
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     builders:
         - 'set-functest-env'
 
@@ -82,12 +76,6 @@
 
     node: '{pod}'
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     builders:
         - 'functest-cleanup'
 
@@ -96,12 +84,6 @@
 
     node: '{node}'
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     builders:
         - 'set-functest-env'
 
@@ -110,12 +92,6 @@
 
     node: '{node}'
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     builders:
         - 'functest-cleanup'
 
@@ -124,12 +100,6 @@
 
     node: '{pod}'
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     builders:
         - 'functest-rally-bench'
 
@@ -138,12 +108,6 @@
 
     node: '{pod}'
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     builders:
         - 'functest-tempest-smoke'
 
@@ -152,12 +116,6 @@
 
     node: '{pod}'
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     builders:
         - shell: |
         - 'functest-odl'
@@ -167,12 +125,6 @@
 
     node: '{pod}'
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     builders:
         - 'functest-vping'
 
@@ -201,12 +153,6 @@
             refspec: ''
             branch: master
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     builders:
         - 'functest-cleanup'
         - 'set-functest-env'
@@ -241,12 +187,6 @@
             refspec: ''
             branch: master
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     builders:
         - 'functest-cleanup'
         - 'set-functest-env'
@@ -281,12 +221,6 @@
             refspec: ''
             branch: master
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     builders:
         - 'functest-vims'
 
@@ -329,12 +263,6 @@
 - job-template:
     name: 'functest-verify-{stream}'
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     parameters:
         - project-parameter:
             project: '{project}'

diff --git a/jjb/genesis/genesis-foreman.yml b/jjb/genesis/genesis-foreman.yml
index 1d0bce9..39b3a58 100644 (file)
--- a/jjb/genesis/genesis-foreman.yml
+++ b/jjb/genesis/genesis-foreman.yml
@@ -46,12 +46,6 @@
             enabled: true
             max-total: 1
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     parameters:
         - project-parameter:
             project: '{project}'
@@ -195,12 +189,6 @@
             refspec: ''
             branch: '{branch}'
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     builders:
         - trigger-builds:
           - project: 'genesis-foreman-build-{stream}'
@@ -239,12 +227,6 @@
 
     disabled: false
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     parameters:
         - project-parameter:
             project: '{project}'
@@ -282,12 +264,6 @@
 
     node: ericsson-build
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     parameters:
         - project-parameter:
             project: '{project}'
@@ -312,12 +288,6 @@
 
     node: opnfv-jump-2
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     parameters:
         - project-parameter:
             project: '{project}'
@@ -343,12 +313,6 @@
 
     disabled: false
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     parameters:
         - project-parameter:
             project: '{project}'
@@ -382,12 +346,6 @@
 
     disabled: true
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     parameters:
         - project-parameter:
             project: '{project}'

diff --git a/jjb/genesis/genesis-fuel-att.yml b/jjb/genesis/genesis-fuel-att.yml
index 785a569..8e40a09 100644 (file)
--- a/jjb/genesis/genesis-fuel-att.yml
+++ b/jjb/genesis/genesis-fuel-att.yml
@@ -59,12 +59,6 @@
     triggers:
         - pollscm: '@midnight'
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     builders:
       - '{installer}-daily-master-att'
 

diff --git a/jjb/genesis/genesis-fuel-dell.yml b/jjb/genesis/genesis-fuel-dell.yml
index 1696529..01b7ea0 100644 (file)
--- a/jjb/genesis/genesis-fuel-dell.yml
+++ b/jjb/genesis/genesis-fuel-dell.yml
@@ -59,12 +59,6 @@
     triggers:
         - pollscm: '@midnight'
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     builders:
       - '{installer}-daily-master-dell'
 

diff --git a/jjb/genesis/genesis-fuel.yml b/jjb/genesis/genesis-fuel.yml
index 2ae748d..8ab7710 100644 (file)
--- a/jjb/genesis/genesis-fuel.yml
+++ b/jjb/genesis/genesis-fuel.yml
@@ -47,12 +47,6 @@
             enabled: true
             max-total: 3
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     parameters:
         - project-parameter:
             project: '{project}'
@@ -206,12 +200,6 @@
             refspec: ''
             branch: '{branch}'
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     builders:
         - trigger-builds:
           - project: 'genesis-fuel-build-{stream}'
@@ -250,12 +238,6 @@
 
     disabled: false
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     parameters:
         - project-parameter:
             project: '{project}'
@@ -293,12 +275,6 @@
 
     node: ericsson-build
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     parameters:
         - project-parameter:
             project: '{project}'
@@ -345,12 +321,6 @@
             refspec: ''
             branch: '{branch}'
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     builders:
         - 'fuel-download-artifact'
         - 'fuel-deploy'
@@ -364,12 +334,6 @@
 
     disabled: false
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     parameters:
         - project-parameter:
             project: '{project}'
@@ -416,12 +380,6 @@
             refspec: ''
             branch: 'master'
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     builders:
         - 'fuel-deploy-virtual'
 

diff --git a/jjb/genesis/genesis-juju.yml b/jjb/genesis/genesis-juju.yml
index 3867d4e..efc09b3 100644 (file)
--- a/jjb/genesis/genesis-juju.yml
+++ b/jjb/genesis/genesis-juju.yml
@@ -27,12 +27,6 @@
 
     node: ericsson-build
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     parameters:
         - string:
             name: BUILD_DIRECTORY
@@ -167,12 +161,6 @@
     triggers:
         - pollscm: '@midnight'
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     builders:
         - 'juju-daily-master'
 

diff --git a/jjb/ipv6/ipv6.yml b/jjb/ipv6/ipv6.yml
index cfab891..13ea054 100644 (file)
--- a/jjb/ipv6/ipv6.yml
+++ b/jjb/ipv6/ipv6.yml
@@ -18,12 +18,6 @@
 - job-template:
     name: ipv6-test
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     builders:
         - shell: |
             echo "Hello world from ipv6"
@@ -67,12 +61,6 @@
 - job-template:
     name: 'ipv6-verify'
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     parameters:
         - project-parameter:
             project: '{project}'

diff --git a/jjb/kvmfornfv/kvmfornfv.yml b/jjb/kvmfornfv/kvmfornfv.yml
index 41718ac..5620033 100644 (file)
--- a/jjb/kvmfornfv/kvmfornfv.yml
+++ b/jjb/kvmfornfv/kvmfornfv.yml
@@ -17,12 +17,6 @@
 
     node: ericsson-build
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     parameters:
         - project-parameter:
             project: '{project}'

diff --git a/jjb/octopus/octopus.yml b/jjb/octopus/octopus.yml
index 3e8bf69..ed452a6 100644 (file)
--- a/jjb/octopus/octopus.yml
+++ b/jjb/octopus/octopus.yml
@@ -28,12 +28,6 @@
 - job-template:
     name: octopus-test
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     builders:
         - shell: |
             echo "Hello world from octopus"
@@ -77,12 +71,6 @@
 - job-template:
     name: 'octopus-verify-{stream}'
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     parameters:
         - project-parameter:
             project: '{project}'

diff --git a/jjb/opnfv/opnfv-docs.yml b/jjb/opnfv/opnfv-docs.yml
index bae9c40..b6c1863 100644 (file)
--- a/jjb/opnfv/opnfv-docs.yml
+++ b/jjb/opnfv/opnfv-docs.yml
@@ -24,12 +24,6 @@
 - job-template:
     name: 'opnfv-docs-verify'
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     parameters:
         - project-parameter:
             project: $GERRIT_PROJECT
@@ -71,12 +65,6 @@
 - job-template:
     name: 'opnfv-docs-merge'
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     parameters:
         - project-parameter:
             project: $GERRIT_PROJECT

diff --git a/jjb/oscar/oscar.yml b/jjb/oscar/oscar.yml
index fb8a23d..df50160 100644 (file)
--- a/jjb/oscar/oscar.yml
+++ b/jjb/oscar/oscar.yml
@@ -18,12 +18,6 @@
 - job-template:
     name: oscar-test
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     builders:
         - shell: |
             echo "Hello world from oscar"
@@ -67,12 +61,6 @@
 - job-template:
     name: 'oscar-verify'
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     parameters:
         - project-parameter:
             project: '{project}'

diff --git a/jjb/ovsnfv/ovsnfv.yml b/jjb/ovsnfv/ovsnfv.yml
index 224a81f..6769f68 100644 (file)
--- a/jjb/ovsnfv/ovsnfv.yml
+++ b/jjb/ovsnfv/ovsnfv.yml
@@ -16,12 +16,6 @@
 
     node: opnfv-build
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     parameters:
         - project-parameter:
             project: '{project}'

diff --git a/jjb/parser/parser.yml b/jjb/parser/parser.yml
index 05addcb..80c4b76 100644 (file)
--- a/jjb/parser/parser.yml
+++ b/jjb/parser/parser.yml
@@ -18,12 +18,6 @@
 - job-template:
     name: parser-test
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     builders:
         - shell: |
             echo "Hello world from parser"
@@ -39,12 +33,6 @@
 
     varsetabove: '{somevar}'
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     parameters:
         - project-parameter:
             project: '{project}'
@@ -71,12 +59,6 @@
 - job-template:
     name: 'parser-verify'
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     parameters:
         - project-parameter:
             project: '{project}'

diff --git a/jjb/pharos/pharos.yml b/jjb/pharos/pharos.yml
index f596d6a..92890df 100644 (file)
--- a/jjb/pharos/pharos.yml
+++ b/jjb/pharos/pharos.yml
@@ -63,12 +63,6 @@
 - job-template:
     name: 'pharos-verify-{stream}'
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     parameters:
         - project-parameter:
             project: '{project}'

diff --git a/jjb/prediction/prediction.yml b/jjb/prediction/prediction.yml
index d47392c..ee47f86 100644 (file)
--- a/jjb/prediction/prediction.yml
+++ b/jjb/prediction/prediction.yml
@@ -18,12 +18,6 @@
 - job-template:
     name: prediction-test
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     builders:
         - shell: |
             echo "Hello world from prediction"
@@ -39,12 +33,6 @@
 
     varsetabove: '{somevar}'
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     parameters:
         - project-parameter:
             project: '{project}'
@@ -71,12 +59,6 @@
 - job-template:
     name: 'prediction-verify'
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     parameters:
         - project-parameter:
             project: '{project}'

diff --git a/jjb/qtip/qtip.yml b/jjb/qtip/qtip.yml
index 8abde90..d4d21a3 100644 (file)
--- a/jjb/qtip/qtip.yml
+++ b/jjb/qtip/qtip.yml
@@ -27,12 +27,6 @@
 - job-template:
     name: qtip-test
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     builders:
         - shell: |
             echo "Hello world from qtip"
@@ -76,12 +70,6 @@
 - job-template:
     name: 'qtip-verify'
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     parameters:
         - project-parameter:
             project: '{project}'
@@ -163,12 +151,6 @@
 
     node: '{node}'
 
-    logrotate:
-      daysToKeep: 30
-      numToKeep: 10
-      artifactDaysToKeep: -1
-      artifactNumToKeep: -1
-
     parameters:
       - project-parameter:
           project: '{project}'
@@ -205,12 +187,6 @@
 
     node: '{node}'
 
-    logrotate:
-      daysToKeep: 30
-      numToKeep: 10
-      artifactDaysToKeep: -1
-      artifactNumToKeep: -1
-
     parameters:
       - project-parameter:
           project: '{project}'

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index 3771472..fed1056 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -6,8 +6,8 @@
     logrotate:
         daysToKeep: 30
         numToKeep: 40
-        artifactDaysToKeep: -1
-        artifactNumToKeep: 5
+        artifactDaysToKeep: 30
+        artifactNumToKeep: 40
 
     ssh-credentials: 'd42411ac011ad6f3dd2e1fa34eaa5d87f910eb2e'
     wrappers:

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index bd300fd..17d64d0 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -9,12 +9,6 @@
 - job-template:
     name: builder-verify-jjb
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     parameters:
         - project-parameter:
             project: '{project}'
@@ -64,12 +58,6 @@
     #
     # This job's purpose is to update all the JJB
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 40
-        artifactDaysToKeep: -1
-        artifactNumToKeep: 5
-
     parameters:
         - project-parameter:
             project: '{project}'

diff --git a/jjb/storperf/storperf.yml b/jjb/storperf/storperf.yml
index c58f9ef..dd00474 100644 (file)
--- a/jjb/storperf/storperf.yml
+++ b/jjb/storperf/storperf.yml
@@ -18,12 +18,6 @@
 
     node: opnfv-build
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     parameters:
         - project-parameter:
             project: '{project}'

diff --git a/jjb/vnf_forwarding_graph/vnf_forwarding_graph.yml b/jjb/vnf_forwarding_graph/vnf_forwarding_graph.yml
index 1083c3c..de63c4e 100644 (file)
--- a/jjb/vnf_forwarding_graph/vnf_forwarding_graph.yml
+++ b/jjb/vnf_forwarding_graph/vnf_forwarding_graph.yml
@@ -18,12 +18,6 @@
 - job-template:
     name: vnf_forwarding_graph-test
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     builders:
         - shell: |
             echo "Hello world from vnf_forwarding_graph"
@@ -67,12 +61,6 @@
 - job-template:
     name: 'vnf_forwarding_graph-verify'
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     parameters:
         - project-parameter:
             project: '{project}'

diff --git a/jjb/vswitchperf/vswitchperf.yml b/jjb/vswitchperf/vswitchperf.yml
index 9630cdb..b4bc70f 100644 (file)
--- a/jjb/vswitchperf/vswitchperf.yml
+++ b/jjb/vswitchperf/vswitchperf.yml
@@ -72,12 +72,6 @@
             max-total: 3
             max-per-node: 2
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     parameters:
         - project-parameter:
             project: '{project}'

diff --git a/jjb/yardstick/yardstick.yml b/jjb/yardstick/yardstick.yml
index 25c16ce..65d9862 100644 (file)
--- a/jjb/yardstick/yardstick.yml
+++ b/jjb/yardstick/yardstick.yml
@@ -32,12 +32,6 @@
 
     node: ericsson-build
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     parameters:
         - project-parameter:
             project: '{project}'
@@ -171,12 +165,6 @@
             refspec: ''
             branch: master
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     triggers:
         - 'yardstick-trigger-{pod}'