diff options
30 files changed, 5 insertions, 301 deletions
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml index f920c9b9b..88a7d94f3 100644 --- a/jjb/apex/apex.yml +++ b/jjb/apex/apex.yml @@ -82,12 +82,6 @@ node: opnfv-jump-1 - logrotate: - daysToKeep: 30 - numToKeep: 40 - artifactDaysToKeep: -1 - artifactNumToKeep: 5 - parameters: - apex-parameter: gs-pathname: '{gs-pathname}' @@ -140,12 +134,6 @@ disabled: false - logrotate: - daysToKeep: '{build-days-to-keep}' - numToKeep: '{build-num-to-keep}' - artifactDaysToKeep: '{build-artifact-days-to-keep}' - artifactNumToKeep: '{build-artifact-num-to-keep}' - parameters: - project-parameter: project: '{project}' diff --git a/jjb/armband/armband.yml b/jjb/armband/armband.yml index 379a8aecb..cb5dc95c1 100644 --- a/jjb/armband/armband.yml +++ b/jjb/armband/armband.yml @@ -39,12 +39,6 @@ varsetabove: '{somevar}' - logrotate: - daysToKeep: '{build-days-to-keep}' - numToKeep: '{build-num-to-keep}' - artifactDaysToKeep: '{build-artifact-days-to-keep}' - artifactNumToKeep: '{build-artifact-num-to-keep}' - parameters: - project-parameter: project: '{project}' @@ -128,12 +122,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/availability/availability.yml b/jjb/availability/availability.yml index 10fdf6ef5..741fd8299 100644 --- a/jjb/availability/availability.yml +++ b/jjb/availability/availability.yml @@ -39,12 +39,6 @@ varsetabove: '{somevar}' - logrotate: - daysToKeep: '{build-days-to-keep}' - numToKeep: '{build-num-to-keep}' - artifactDaysToKeep: '{build-artifact-days-to-keep}' - artifactNumToKeep: '{build-artifact-num-to-keep}' - parameters: - project-parameter: project: '{project}' @@ -118,12 +112,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/bottlenecks/bottlenecks.yml b/jjb/bottlenecks/bottlenecks.yml index 582fbec5a..a1687c38c 100644 --- a/jjb/bottlenecks/bottlenecks.yml +++ b/jjb/bottlenecks/bottlenecks.yml @@ -123,12 +123,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/compass4nfv/compass4nfv.yml b/jjb/compass4nfv/compass4nfv.yml index 426a93b58..74f9a4539 100644 --- a/jjb/compass4nfv/compass4nfv.yml +++ b/jjb/compass4nfv/compass4nfv.yml @@ -122,12 +122,6 @@ max-total: 3 max-per-node: 1 - logrotate: - daysToKeep: 30 - numToKeep: 40 - artifactDaysToKeep: -1 - artifactNumToKeep: 5 - parameters: - project-parameter: project: '{project}' diff --git a/jjb/conductor/conductor.yml b/jjb/conductor/conductor.yml index 6851b6ea8..5d1e57803 100644 --- a/jjb/conductor/conductor.yml +++ b/jjb/conductor/conductor.yml @@ -39,12 +39,6 @@ varsetabove: '{somevar}' - logrotate: - daysToKeep: '{build-days-to-keep}' - numToKeep: '{build-num-to-keep}' - artifactDaysToKeep: '{build-artifact-days-to-keep}' - artifactNumToKeep: '{build-artifact-num-to-keep}' - parameters: - project-parameter: project: '{project}' @@ -122,12 +116,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/doctor/doctor.yml b/jjb/doctor/doctor.yml index a93af98ec..d356b2c8e 100644 --- a/jjb/doctor/doctor.yml +++ b/jjb/doctor/doctor.yml @@ -13,11 +13,6 @@ - job_defaults: &job_defaults name: job_defaults - logrotate: - daysToKeep: '{build-days-to-keep}' - numToKeep: '{build-num-to-keep}' - artifactDaysToKeep: '{build-artifact-days-to-keep}' - artifactNumToKeep: '{build-artifact-num-to-keep}' parameters: - project-parameter: project: '{project}' diff --git a/jjb/dpacc/dpacc.yml b/jjb/dpacc/dpacc.yml index 34f784fe4..0a4e6e417 100644 --- a/jjb/dpacc/dpacc.yml +++ b/jjb/dpacc/dpacc.yml @@ -39,12 +39,6 @@ varsetabove: '{somevar}' - logrotate: - daysToKeep: '{build-days-to-keep}' - numToKeep: '{build-num-to-keep}' - artifactDaysToKeep: '{build-artifact-days-to-keep}' - artifactNumToKeep: '{build-artifact-num-to-keep}' - parameters: - project-parameter: project: '{project}' @@ -122,12 +116,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/fastpathmetrics/fastpathmetrics.yml b/jjb/fastpathmetrics/fastpathmetrics.yml index 6004874dc..191597631 100644 --- a/jjb/fastpathmetrics/fastpathmetrics.yml +++ b/jjb/fastpathmetrics/fastpathmetrics.yml @@ -39,12 +39,6 @@ varsetabove: '{somevar}' - logrotate: - daysToKeep: '{build-days-to-keep}' - numToKeep: '{build-num-to-keep}' - artifactDaysToKeep: '{build-artifact-days-to-keep}' - artifactNumToKeep: '{build-artifact-num-to-keep}' - parameters: - project-parameter: project: '{project}' @@ -122,12 +116,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/fuel/fuel.yml b/jjb/fuel/fuel.yml index 1566109a4..e7ad2bd9c 100644 --- a/jjb/fuel/fuel.yml +++ b/jjb/fuel/fuel.yml @@ -105,12 +105,6 @@ enabled: true max-total: 2 - logrotate: - daysToKeep: 30 - numToKeep: 40 - artifactDaysToKeep: -1 - artifactNumToKeep: 5 - parameters: - project-parameter: project: '{project}' @@ -166,12 +160,6 @@ max-total: 2 max-per-node: 1 - logrotate: - daysToKeep: 30 - numToKeep: 40 - artifactDaysToKeep: -1 - artifactNumToKeep: 5 - parameters: - project-parameter: project: '{project}' @@ -239,12 +227,6 @@ refspec: '' branch: '{branch}' - logrotate: - daysToKeep: '{build-days-to-keep}' - numToKeep: '{build-num-to-keep}' - artifactDaysToKeep: '{build-artifact-days-to-keep}' - artifactNumToKeep: '{build-artifact-num-to-keep}' - builders: - trigger-builds: - project: 'fuel-build-{stream}' diff --git a/jjb/functest/functest.yml b/jjb/functest/functest.yml index 96b770ba2..17a6db85f 100644 --- a/jjb/functest/functest.yml +++ b/jjb/functest/functest.yml @@ -292,12 +292,6 @@ varsetabove: '{somevar}' - logrotate: - daysToKeep: '{build-days-to-keep}' - numToKeep: '{build-num-to-keep}' - artifactDaysToKeep: '{build-artifact-days-to-keep}' - artifactNumToKeep: '{build-artifact-num-to-keep}' - parameters: - project-parameter: project: '{project}' @@ -373,12 +367,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/genesis/genesis-docs.yml b/jjb/genesis/genesis-docs.yml index dc3d92709..fa8b35aed 100644 --- a/jjb/genesis/genesis-docs.yml +++ b/jjb/genesis/genesis-docs.yml @@ -27,12 +27,6 @@ node: gce-opnfv-docker-1 - logrotate: - daysToKeep: 30 - numToKeep: 40 - artifactDaysToKeep: -1 - artifactNumToKeep: 5 - parameters: - project-parameter: project: '{project}' @@ -87,12 +81,6 @@ node: gce-opnfv-docker-1 - logrotate: - daysToKeep: 30 - numToKeep: 40 - artifactDaysToKeep: -1 - artifactNumToKeep: 5 - parameters: - project-parameter: project: '{project}' diff --git a/jjb/genesis/genesis-foreman.yml b/jjb/genesis/genesis-foreman.yml index b12e32041..1d0bce945 100644 --- a/jjb/genesis/genesis-foreman.yml +++ b/jjb/genesis/genesis-foreman.yml @@ -121,12 +121,6 @@ enabled: true max-total: 2 - logrotate: - daysToKeep: 30 - numToKeep: 40 - artifactDaysToKeep: -1 - artifactNumToKeep: 5 - parameters: - project-parameter: project: '{project}' diff --git a/jjb/genesis/genesis-fuel.yml b/jjb/genesis/genesis-fuel.yml index fca14298d..2ae748d96 100644 --- a/jjb/genesis/genesis-fuel.yml +++ b/jjb/genesis/genesis-fuel.yml @@ -127,12 +127,6 @@ enabled: true max-total: 2 - logrotate: - daysToKeep: 30 - numToKeep: 40 - artifactDaysToKeep: -1 - artifactNumToKeep: 5 - parameters: - project-parameter: project: '{project}' diff --git a/jjb/genesis/genesis-juju.yml b/jjb/genesis/genesis-juju.yml index 91702bf9b..3867d4e2d 100644 --- a/jjb/genesis/genesis-juju.yml +++ b/jjb/genesis/genesis-juju.yml @@ -87,12 +87,6 @@ node: ericsson-build - logrotate: - daysToKeep: 30 - numToKeep: 40 - artifactDaysToKeep: -1 - artifactNumToKeep: 5 - parameters: - string: name: BUILD_DIRECTORY diff --git a/jjb/ipv6/ipv6.yml b/jjb/ipv6/ipv6.yml index 3453c79d7..cfab89186 100644 --- a/jjb/ipv6/ipv6.yml +++ b/jjb/ipv6/ipv6.yml @@ -39,12 +39,6 @@ varsetabove: '{somevar}' - logrotate: - daysToKeep: '{build-days-to-keep}' - numToKeep: '{build-num-to-keep}' - artifactDaysToKeep: '{build-artifact-days-to-keep}' - artifactNumToKeep: '{build-artifact-num-to-keep}' - parameters: - project-parameter: project: '{project}' @@ -122,12 +116,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/kvmfornfv/kvmfornfv.yml b/jjb/kvmfornfv/kvmfornfv.yml index 8ce5edbf6..41718ac8f 100644 --- a/jjb/kvmfornfv/kvmfornfv.yml +++ b/jjb/kvmfornfv/kvmfornfv.yml @@ -71,12 +71,6 @@ node: ericsson-build - logrotate: - daysToKeep: 30 - numToKeep: 40 - artifactDaysToKeep: -1 - artifactNumToKeep: 5 - parameters: - project-parameter: project: '{project}' diff --git a/jjb/octopus/octopus.yml b/jjb/octopus/octopus.yml index 33d45ccd6..3e8bf6926 100644 --- a/jjb/octopus/octopus.yml +++ b/jjb/octopus/octopus.yml @@ -49,12 +49,6 @@ varsetabove: '{somevar}' - logrotate: - daysToKeep: '{build-days-to-keep}' - numToKeep: '{build-num-to-keep}' - artifactDaysToKeep: '{build-artifact-days-to-keep}' - artifactNumToKeep: '{build-artifact-num-to-keep}' - parameters: - project-parameter: project: '{project}' @@ -130,12 +124,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/opnfv/opnfv-docker.yml b/jjb/opnfv/opnfv-docker.yml index 93e7961db..46a05230b 100644 --- a/jjb/opnfv/opnfv-docker.yml +++ b/jjb/opnfv/opnfv-docker.yml @@ -60,12 +60,6 @@ refspec: '' branch: '{branch}' - logrotate: - daysToKeep: '{build-days-to-keep}' - numToKeep: '{build-num-to-keep}' - artifactDaysToKeep: '{build-artifact-days-to-keep}' - artifactNumToKeep: '{build-artifact-num-to-keep}' - builders: - shell: !include-raw ./opnfv-docker.sh diff --git a/jjb/oscar/oscar.yml b/jjb/oscar/oscar.yml index 81306824b..fb8a23de2 100644 --- a/jjb/oscar/oscar.yml +++ b/jjb/oscar/oscar.yml @@ -39,12 +39,6 @@ varsetabove: '{somevar}' - logrotate: - daysToKeep: '{build-days-to-keep}' - numToKeep: '{build-num-to-keep}' - artifactDaysToKeep: '{build-artifact-days-to-keep}' - artifactNumToKeep: '{build-artifact-num-to-keep}' - parameters: - project-parameter: project: '{project}' @@ -122,12 +116,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/ovsnfv/ovsnfv.yml b/jjb/ovsnfv/ovsnfv.yml index 4bfabffa6..224a81f88 100644 --- a/jjb/ovsnfv/ovsnfv.yml +++ b/jjb/ovsnfv/ovsnfv.yml @@ -72,12 +72,6 @@ node: opnfv-build - logrotate: - daysToKeep: 30 - numToKeep: 40 - artifactDaysToKeep: -1 - artifactNumToKeep: 5 - parameters: - project-parameter: project: '{project}' @@ -124,12 +118,6 @@ disabled: true - logrotate: - daysToKeep: '{build-days-to-keep}' - numToKeep: '{build-num-to-keep}' - artifactDaysToKeep: '{build-artifact-days-to-keep}' - artifactNumToKeep: '{build-artifact-num-to-keep}' - parameters: - project-parameter: project: '{project}' diff --git a/jjb/parser/parser.yml b/jjb/parser/parser.yml index 463d64b81..05addcb83 100644 --- a/jjb/parser/parser.yml +++ b/jjb/parser/parser.yml @@ -118,12 +118,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/pharos/pharos.yml b/jjb/pharos/pharos.yml index 6ab54598d..f596d6a9b 100644 --- a/jjb/pharos/pharos.yml +++ b/jjb/pharos/pharos.yml @@ -35,12 +35,6 @@ varsetabove: '{somevar}' - logrotate: - daysToKeep: '{build-days-to-keep}' - numToKeep: '{build-num-to-keep}' - artifactDaysToKeep: '{build-artifact-days-to-keep}' - artifactNumToKeep: '{build-artifact-num-to-keep}' - parameters: - project-parameter: project: '{project}' @@ -116,12 +110,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}' @@ -154,16 +142,6 @@ - job-template: name: 'pharos-maas-pilot-{stream}' - node: master - - project-type: freestyle - - logrotate: - daysToKeep: '{build-days-to-keep}' - numToKeep: '{build-num-to-keep}' - artifactDaysToKeep: '{build-artifact-days-to-keep}' - artifactNumToKeep: '{build-artifact-num-to-keep}' - parameters: - project-parameter: project: '{project}' diff --git a/jjb/prediction/prediction.yml b/jjb/prediction/prediction.yml index 76fcef208..d47392c20 100644 --- a/jjb/prediction/prediction.yml +++ b/jjb/prediction/prediction.yml @@ -118,12 +118,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/qtip/qtip.yml b/jjb/qtip/qtip.yml index d75ede0bf..8abde902c 100644 --- a/jjb/qtip/qtip.yml +++ b/jjb/qtip/qtip.yml @@ -48,12 +48,6 @@ varsetabove: '{somevar}' - logrotate: - daysToKeep: '{build-days-to-keep}' - numToKeep: '{build-num-to-keep}' - artifactDaysToKeep: '{build-artifact-days-to-keep}' - artifactNumToKeep: '{build-artifact-num-to-keep}' - parameters: - project-parameter: project: '{project}' @@ -131,12 +125,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/releng-defaults.yaml b/jjb/releng-defaults.yaml index faf3ea6f9..37714722d 100644 --- a/jjb/releng-defaults.yaml +++ b/jjb/releng-defaults.yaml @@ -3,10 +3,11 @@ - defaults: name: global - build-days-to-keep: 30 - build-num-to-keep: 40 - build-artifact-days-to-keep: -1 - build-artifact-num-to-keep: 5 + logrotate: + daysToKeep: 30 + numToKeep: 40 + artifactDaysToKeep: -1 + artifactNumToKeep: 5 ssh-credentials: 'd42411ac011ad6f3dd2e1fa34eaa5d87f910eb2e' wrappers: diff --git a/jjb/storperf/storperf.yml b/jjb/storperf/storperf.yml index ed21bc777..78c2471bd 100644 --- a/jjb/storperf/storperf.yml +++ b/jjb/storperf/storperf.yml @@ -72,12 +72,6 @@ node: intel-jp-build-1 - logrotate: - daysToKeep: 30 - numToKeep: 40 - artifactDaysToKeep: -1 - artifactNumToKeep: 5 - parameters: - project-parameter: project: '{project}' @@ -127,12 +121,6 @@ disabled: true - logrotate: - daysToKeep: '{build-days-to-keep}' - numToKeep: '{build-num-to-keep}' - artifactDaysToKeep: '{build-artifact-days-to-keep}' - artifactNumToKeep: '{build-artifact-num-to-keep}' - 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 5a87bf441..1083c3c52 100644 --- a/jjb/vnf_forwarding_graph/vnf_forwarding_graph.yml +++ b/jjb/vnf_forwarding_graph/vnf_forwarding_graph.yml @@ -39,12 +39,6 @@ varsetabove: '{somevar}' - logrotate: - daysToKeep: '{build-days-to-keep}' - numToKeep: '{build-num-to-keep}' - artifactDaysToKeep: '{build-artifact-days-to-keep}' - artifactNumToKeep: '{build-artifact-num-to-keep}' - parameters: - project-parameter: project: '{project}' @@ -122,12 +116,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/vswitchperf/vswitchperf.yml b/jjb/vswitchperf/vswitchperf.yml index a7b78d1ab..9630cdbbc 100644 --- a/jjb/vswitchperf/vswitchperf.yml +++ b/jjb/vswitchperf/vswitchperf.yml @@ -26,12 +26,6 @@ varsetabove: '{somevar}' node: opnfv-build - logrotate: - daysToKeep: '{build-days-to-keep}' - numToKeep: '{build-num-to-keep}' - artifactDaysToKeep: '{build-artifact-days-to-keep}' - artifactNumToKeep: '{build-artifact-num-to-keep}' - parameters: - project-parameter: project: '{project}' @@ -148,12 +142,6 @@ max-total: 3 max-per-node: 2 - logrotate: - daysToKeep: 30 - numToKeep: 40 - artifactDaysToKeep: -1 - artifactNumToKeep: 5 - parameters: - project-parameter: project: '{project}' diff --git a/jjb/yardstick/yardstick.yml b/jjb/yardstick/yardstick.yml index b384102cb..25c16cee5 100644 --- a/jjb/yardstick/yardstick.yml +++ b/jjb/yardstick/yardstick.yml @@ -97,12 +97,6 @@ node: ericsson-build - logrotate: - daysToKeep: 30 - numToKeep: 40 - artifactDaysToKeep: -1 - artifactNumToKeep: 5 - parameters: - project-parameter: project: '{project}' |