From 9c49c98cb5fcd4f5f0df40f09853b919c85c38da Mon Sep 17 00:00:00 2001 From: Ryota MIBU Date: Thu, 26 Nov 2015 22:14:27 +0900 Subject: [PATCH] jjb: move project-style to releng-defaults.yaml Change-Id: Iced99bd62a8a246984e67dc28be7d4dca149e22b Signed-off-by: Ryota MIBU --- jjb/apex/apex.yml | 6 ---- jjb/armband/armband.yml | 7 ---- jjb/availability/availability.yml | 12 ------- jjb/bottlenecks/bottlenecks.yml | 7 ---- jjb/compass4nfv/compass4nfv.yml | 20 ----------- jjb/conductor/conductor.yml | 7 ---- jjb/copper/copper.yml | 2 -- jjb/doctor/doctor.yml | 1 - jjb/dpacc/dpacc.yml | 7 ---- jjb/fastpathmetrics/fastpathmetrics.yml | 12 ------- jjb/fuel/fuel.yml | 14 -------- jjb/functest/functest.yml | 42 ----------------------- jjb/genesis/genesis-docs.yml | 5 --- jjb/genesis/genesis-foreman.yml | 17 --------- jjb/genesis/genesis-fuel-att.yml | 5 --- jjb/genesis/genesis-fuel-dell.yml | 5 --- jjb/genesis/genesis-fuel.yml | 16 --------- jjb/genesis/genesis-juju.yml | 7 ---- jjb/ipv6/ipv6.yml | 12 ------- jjb/kvmfornfv/kvmfornfv.yml | 4 --- jjb/octopus/octopus.yml | 9 ----- jjb/opnfv/opnfv-docker.yml | 2 -- jjb/opnfv/opnfv-docs.yml | 5 --- jjb/oscar/oscar.yml | 7 ---- jjb/ovsnfv/ovsnfv.yml | 7 ---- jjb/parser/parser.yml | 8 ----- jjb/pharos/pharos.yml | 5 --- jjb/prediction/prediction.yml | 8 ----- jjb/qtip/qtip.yml | 18 ---------- jjb/releng-defaults.yaml | 2 ++ jjb/releng-jobs.yaml | 4 --- jjb/storperf/storperf.yml | 8 ----- jjb/vnf_forwarding_graph/vnf_forwarding_graph.yml | 12 ------- jjb/vswitchperf/vswitchperf.yml | 2 -- jjb/yardstick/yardstick.yml | 6 ---- 35 files changed, 2 insertions(+), 309 deletions(-) diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml index cb0a0f369..f920c9b9b 100644 --- a/jjb/apex/apex.yml +++ b/jjb/apex/apex.yml @@ -21,8 +21,6 @@ node: opnfv-jump-1 - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 10 @@ -84,8 +82,6 @@ node: opnfv-jump-1 - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 40 @@ -144,8 +140,6 @@ disabled: false - project-type: freestyle - logrotate: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' diff --git a/jjb/armband/armband.yml b/jjb/armband/armband.yml index 81710d265..27b4082d6 100644 --- a/jjb/armband/armband.yml +++ b/jjb/armband/armband.yml @@ -18,8 +18,6 @@ - job-template: name: armband-test - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 10 @@ -41,7 +39,6 @@ # stream: branch with - in place of / (eg. stable) # branch: branch (eg. stable) - project-type: freestyle varsetabove: '{somevar}' logrotate: @@ -80,8 +77,6 @@ node: ericsson-build - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 10 @@ -137,8 +132,6 @@ # # This job's purpose is to update all the JJB - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 40 diff --git a/jjb/availability/availability.yml b/jjb/availability/availability.yml index 6bb068b49..e31685042 100644 --- a/jjb/availability/availability.yml +++ b/jjb/availability/availability.yml @@ -18,8 +18,6 @@ - job-template: name: availability-test - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 10 @@ -40,7 +38,6 @@ # branch: branch (eg. stable) node: master - project-type: freestyle varsetabove: '{somevar}' logrotate: @@ -77,8 +74,6 @@ node: master - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 10 @@ -128,8 +123,6 @@ node: master - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 40 @@ -165,8 +158,3 @@ - shell: !include-raw docu-build.sh - - - - - diff --git a/jjb/bottlenecks/bottlenecks.yml b/jjb/bottlenecks/bottlenecks.yml index 049a51eef..c0d1b08f2 100644 --- a/jjb/bottlenecks/bottlenecks.yml +++ b/jjb/bottlenecks/bottlenecks.yml @@ -23,8 +23,6 @@ - job-template: name: 'bottlenecks-test' - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 10 @@ -46,7 +44,6 @@ # stream: branch with - in place of / (eg. stable) # branch: branch (eg. stable) - project-type: freestyle varsetabove: '{somevar}' logrotate: @@ -83,8 +80,6 @@ node: master - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 10 @@ -134,8 +129,6 @@ # # This job's purpose is to update all the JJB - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 40 diff --git a/jjb/compass4nfv/compass4nfv.yml b/jjb/compass4nfv/compass4nfv.yml index 0e41e1ba6..426a93b58 100644 --- a/jjb/compass4nfv/compass4nfv.yml +++ b/jjb/compass4nfv/compass4nfv.yml @@ -39,8 +39,6 @@ - job-template: name: 'compass-verify' - project-type: freestyle - disabled: false node: 'huawei-deploy-vm' @@ -76,7 +74,6 @@ refspec: '$GERRIT_REFSPEC' choosing-strategy: 'gerrit' - triggers: - gerrit: trigger-on: @@ -115,8 +112,6 @@ # # This job's purpose is to update all the JJB - project-type: freestyle - node: huawei-build concurrent: true @@ -166,8 +161,6 @@ - job-template: name: 'compass-daily-{stream}' - project-type: freestyle - node: huawei-build concurrent: true @@ -220,8 +213,6 @@ - job-template: name: 'compass-build-iso' - project-type: freestyle - node: ericsson-build concurrent: true @@ -260,8 +251,6 @@ description: "build ppa(using docker) in huawei lab" - project-type: freestyle - node: huawei-build concurrent: true @@ -299,8 +288,6 @@ - job-template: name: 'compass-deploy-virtual-{flavor}' - project-type: freestyle - disabled: false node: '{node}' @@ -323,14 +310,12 @@ default: '{conf}' description: "" - logrotate: daysToKeep: 30 numToKeep: 10 artifactDaysToKeep: -1 artifactNumToKeep: -1 - builders: - 'builder-compass-ci-preclean-workspace' - 'builder-compass-download-artifact' @@ -341,12 +326,9 @@ allow-empty: 'true' fingerprint: true - - job-template: name: 'compass-deploy-bare-huawei-us' - project-type: freestyle - disabled: false node: 'huawei-us-deploy-bare-1' @@ -382,7 +364,6 @@ allow-empty: 'true' fingerprint: true - ######################## # parameter macros ######################## @@ -587,7 +568,6 @@ gsutil cp $BUILD_DIRECTORY/opnfv.properties gs://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.properties > gsutil.properties.log 2>&1 gsutil cp $BUILD_DIRECTORY/opnfv.properties gs://$GS_URL/latest.properties > gsutil.latest.log 2>&1 - echo echo "--------------------------------------------------------" echo "Done!" diff --git a/jjb/conductor/conductor.yml b/jjb/conductor/conductor.yml index 01ccdaf14..6851b6ea8 100644 --- a/jjb/conductor/conductor.yml +++ b/jjb/conductor/conductor.yml @@ -18,8 +18,6 @@ - job-template: name: conductor-test - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 10 @@ -39,7 +37,6 @@ # stream: branch with - in place of / (eg. stable) # branch: branch (eg. stable) - project-type: freestyle varsetabove: '{somevar}' logrotate: @@ -76,8 +73,6 @@ - job-template: name: 'conductor-verify' - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 10 @@ -127,8 +122,6 @@ # # This job's purpose is to update all the JJB - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 40 diff --git a/jjb/copper/copper.yml b/jjb/copper/copper.yml index 04d9074f5..47651b2e9 100644 --- a/jjb/copper/copper.yml +++ b/jjb/copper/copper.yml @@ -15,8 +15,6 @@ - job-template: name: copper-test - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 10 diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml index ddc6efdea..98f2863e9 100644 --- a/jjb/doctor/doctor.yml +++ b/jjb/doctor/doctor.yml @@ -14,7 +14,6 @@ - job_defaults: &job_defaults name: job_defaults node: master - project-type: freestyle logrotate: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' diff --git a/jjb/dpacc/dpacc.yml b/jjb/dpacc/dpacc.yml index d027f47fe..34f784fe4 100644 --- a/jjb/dpacc/dpacc.yml +++ b/jjb/dpacc/dpacc.yml @@ -18,8 +18,6 @@ - job-template: name: dpacc-test - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 10 @@ -39,7 +37,6 @@ # stream: branch with - in place of / (eg. stable) # branch: branch (eg. stable) - project-type: freestyle varsetabove: '{somevar}' logrotate: @@ -76,8 +73,6 @@ - job-template: name: 'dpacc-verify' - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 10 @@ -127,8 +122,6 @@ # # This job's purpose is to update all the JJB - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 40 diff --git a/jjb/fastpathmetrics/fastpathmetrics.yml b/jjb/fastpathmetrics/fastpathmetrics.yml index 6c7edaa67..6004874dc 100644 --- a/jjb/fastpathmetrics/fastpathmetrics.yml +++ b/jjb/fastpathmetrics/fastpathmetrics.yml @@ -18,8 +18,6 @@ - job-template: name: fastpathmetrics-test - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 10 @@ -39,7 +37,6 @@ # stream: branch with - in place of / (eg. stable) # branch: branch (eg. stable) - project-type: freestyle varsetabove: '{somevar}' logrotate: @@ -76,8 +73,6 @@ - job-template: name: 'fastpathmetrics-verify' - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 10 @@ -127,8 +122,6 @@ # # This job's purpose is to update all the JJB - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 40 @@ -166,8 +159,3 @@ find . echo "merge logic goes here" - - - - - diff --git a/jjb/fuel/fuel.yml b/jjb/fuel/fuel.yml index c0ba580de..72faa511c 100644 --- a/jjb/fuel/fuel.yml +++ b/jjb/fuel/fuel.yml @@ -30,8 +30,6 @@ - job-template: name: 'fuel-verify-build-{stream}' - project-type: freestyle - node: ericsson-build concurrent: true @@ -98,8 +96,6 @@ - job-template: name: 'fuel-merge-build-{stream}' - project-type: freestyle - node: ericsson-build concurrent: true @@ -160,8 +156,6 @@ - job-template: name: 'fuel-merge-deploy-virtual-{stream}' - project-type: freestyle - node: fuel-deploy-virtual concurrent: true @@ -225,8 +219,6 @@ - job-template: name: 'fuel-daily-{stream}' - project-type: freestyle - node: ericsson-build disabled: false @@ -283,8 +275,6 @@ - job-template: name: 'fuel-build-{stream}' - project-type: freestyle - node: ericsson-build logrotate: @@ -326,8 +316,6 @@ - job-template: name: 'fuel-deploy-{stream}' - project-type: freestyle - disabled: false node: opnfv-jump-2 @@ -368,8 +356,6 @@ - job-template: name: 'fuel-lab-reconfig-{stream}' - project-type: freestyle - disabled: true node: master diff --git a/jjb/functest/functest.yml b/jjb/functest/functest.yml index 47024e20e..5f103b144 100644 --- a/jjb/functest/functest.yml +++ b/jjb/functest/functest.yml @@ -57,8 +57,6 @@ - job-template: name: set-functest-env-{pod} - project-type: freestyle - node: '{pod}' logrotate: @@ -70,13 +68,9 @@ builders: - 'set-functest-env' - - - job-template: name: clean-functest-env-{pod} - project-type: freestyle - node: '{pod}' logrotate: @@ -88,12 +82,9 @@ builders: - 'functest-cleanup' - - job-template: name: set-functest-env-{installer}-{stream} - project-type: freestyle - node: '{node}' logrotate: @@ -105,12 +96,9 @@ builders: - 'set-functest-env' - - job-template: name: clean-functest-env-{installer}-{stream} - project-type: freestyle - node: '{node}' logrotate: @@ -125,8 +113,6 @@ - job-template: name: functest-openstack-bench-test-{pod} - project-type: freestyle - node: '{pod}' logrotate: @@ -138,12 +124,9 @@ builders: - 'functest-rally-bench' - - job-template: name: functest-openstack-tempest-smoke-test-{pod} - project-type: freestyle - node: '{pod}' logrotate: @@ -158,8 +141,6 @@ - job-template: name: functest-odl-test-{pod} - project-type: freestyle - node: '{pod}' logrotate: @@ -172,12 +153,9 @@ - shell: | - 'functest-odl' - - job-template: name: functest-vping-test-{pod} - project-type: freestyle - node: '{pod}' logrotate: @@ -189,12 +167,9 @@ builders: - 'functest-vping' - - job-template: name: functest-{pod} - project-type: freestyle - node: '{pod}' parameters: @@ -232,8 +207,6 @@ - job-template: name: functest-{installer}-{stream} - project-type: freestyle - node: '{node}' parameters: @@ -274,8 +247,6 @@ - job-template: name: functest-vims-{installer}-{stream} - project-type: freestyle - node: '{node}' parameters: @@ -321,7 +292,6 @@ # stream: branch with - in place of / (eg. stable) # branch: branch (eg. stable) - project-type: freestyle varsetabove: '{somevar}' logrotate: @@ -360,8 +330,6 @@ node: master - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 10 @@ -411,8 +379,6 @@ # # This job's purpose is to update all the JJB - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 40 @@ -515,7 +481,6 @@ container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1) docker exec $container_id $cmd - - builder: name: set-functest-env builders: @@ -552,7 +517,6 @@ echo "Executing command inside the docker: ${cmd}" docker exec ${container_id} ${cmd} - - builder: name: functest-vping builders: @@ -590,8 +554,6 @@ container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1) docker exec $container_id $cmd - - - builder: name: functest-rally-bench builders: @@ -604,7 +566,6 @@ container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1) docker exec $container_id $cmd - - builder: name: functest-vims builders: @@ -617,8 +578,6 @@ container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1) docker exec $container_id $cmd - - - builder: name: functest-store-results builders: @@ -640,7 +599,6 @@ docker ps -a | grep opnfv/functest | awk '{print $1}' | xargs docker rm fi - # Remove existing images if exist if [[ ! -z $(docker images | grep opnfv/functest) ]]; then echo "Docker images to remove:" diff --git a/jjb/genesis/genesis-docs.yml b/jjb/genesis/genesis-docs.yml index 7f7833769..dc3d92709 100644 --- a/jjb/genesis/genesis-docs.yml +++ b/jjb/genesis/genesis-docs.yml @@ -27,8 +27,6 @@ node: gce-opnfv-docker-1 - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 40 @@ -89,8 +87,6 @@ node: gce-opnfv-docker-1 - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 40 @@ -109,7 +105,6 @@ refspec: '$GERRIT_REFSPEC' choosing-strategy: 'gerrit' - triggers: - gerrit: trigger-on: diff --git a/jjb/genesis/genesis-foreman.yml b/jjb/genesis/genesis-foreman.yml index 69a69d3ea..c59aa8fd7 100644 --- a/jjb/genesis/genesis-foreman.yml +++ b/jjb/genesis/genesis-foreman.yml @@ -37,8 +37,6 @@ - job-template: name: 'genesis-foreman-verify-build-{stream}' - project-type: freestyle - node: ericsson-build concurrent: true @@ -114,8 +112,6 @@ - job-template: name: 'genesis-foreman-merge-{stream}' - project-type: freestyle - node: ericsson-build concurrent: true @@ -185,8 +181,6 @@ - job-template: name: 'genesis-foreman-daily-{stream}' - project-type: freestyle - node: ericsson-build disabled: '{obj:disabled}' @@ -249,8 +243,6 @@ - job-template: name: 'genesis-foreman-deploy-runner-{stream}' - project-type: freestyle - disabled: false node: master @@ -296,8 +288,6 @@ - job-template: name: 'genesis-foreman-build-{stream}' - project-type: freestyle - node: ericsson-build logrotate: @@ -326,8 +316,6 @@ - job-template: name: 'genesis-foreman-deploy-{stream}' - project-type: freestyle - disabled: false node: opnfv-jump-2 @@ -361,8 +349,6 @@ - job-template: name: 'genesis-foreman-lab-reconfig-{stream}' - project-type: freestyle - disabled: false node: master @@ -402,8 +388,6 @@ - job-template: name: 'genesis-foreman-verify-deploy-virtual-{stream}' - project-type: freestyle - node: opnfv-jump-1 disabled: true @@ -472,7 +456,6 @@ pattern: '{installer}/docs/**' dependency-jobs: 'genesis-foreman-verify-build-{stream}' - builders: - 'foreman-deploy-virtual' diff --git a/jjb/genesis/genesis-fuel-att.yml b/jjb/genesis/genesis-fuel-att.yml index 889bf11f1..785a569e2 100644 --- a/jjb/genesis/genesis-fuel-att.yml +++ b/jjb/genesis/genesis-fuel-att.yml @@ -21,8 +21,6 @@ - job-template: name: 'genesis-{installer}-daily-att-{stream}' - project-type: freestyle - node: att-build parameters: @@ -70,13 +68,10 @@ builders: - '{installer}-daily-master-att' - - ######################## # builder macros ######################## - - builder: name: fuel-daily-master-att builders: diff --git a/jjb/genesis/genesis-fuel-dell.yml b/jjb/genesis/genesis-fuel-dell.yml index 778349993..16965296c 100644 --- a/jjb/genesis/genesis-fuel-dell.yml +++ b/jjb/genesis/genesis-fuel-dell.yml @@ -21,8 +21,6 @@ - job-template: name: 'genesis-{installer}-daily-dell-{stream}' - project-type: freestyle - node: dell-build parameters: @@ -70,13 +68,10 @@ builders: - '{installer}-daily-master-dell' - - ######################## # builder macros ######################## - - builder: name: fuel-daily-master-dell builders: diff --git a/jjb/genesis/genesis-fuel.yml b/jjb/genesis/genesis-fuel.yml index 04dcfcd90..1ef881b27 100644 --- a/jjb/genesis/genesis-fuel.yml +++ b/jjb/genesis/genesis-fuel.yml @@ -38,8 +38,6 @@ - job-template: name: 'genesis-fuel-verify-build-{stream}' - project-type: freestyle - node: ericsson-build concurrent: true @@ -120,8 +118,6 @@ - job-template: name: 'genesis-fuel-merge-{stream}' - project-type: freestyle - node: ericsson-build concurrent: true @@ -196,8 +192,6 @@ - job-template: name: 'genesis-fuel-daily-{stream}' - project-type: freestyle - node: ericsson-build disabled: '{obj:disabled}' @@ -260,8 +254,6 @@ - job-template: name: 'genesis-fuel-deploy-runner-{stream}' - project-type: freestyle - disabled: false node: master @@ -307,8 +299,6 @@ - job-template: name: 'genesis-fuel-build-{stream}' - project-type: freestyle - node: ericsson-build logrotate: @@ -342,8 +332,6 @@ - job-template: name: 'genesis-fuel-deploy-{stream}' - project-type: freestyle - disabled: false node: opnfv-jump-2 @@ -382,8 +370,6 @@ - job-template: name: 'genesis-fuel-lab-reconfig-{stream}' - project-type: freestyle - disabled: false node: master @@ -423,8 +409,6 @@ - job-template: name: 'genesis-fuel-verify-deploy-virtual-{stream}' - project-type: freestyle - disabled: true node: ericsson-build diff --git a/jjb/genesis/genesis-juju.yml b/jjb/genesis/genesis-juju.yml index 3ecb74c22..91702bf9b 100644 --- a/jjb/genesis/genesis-juju.yml +++ b/jjb/genesis/genesis-juju.yml @@ -25,8 +25,6 @@ - job-template: name: 'genesis-juju-verify' - project-type: freestyle - node: ericsson-build logrotate: @@ -77,7 +75,6 @@ - compare-type: ANT pattern: 'juju/**' - builders: - 'juju-verify' @@ -88,8 +85,6 @@ # # This job's purpose is to update all the JJB - project-type: freestyle - node: ericsson-build logrotate: @@ -140,8 +135,6 @@ - job-template: name: 'genesis-juju-daily-{stream}' - project-type: freestyle - node: ericsson-build parameters: diff --git a/jjb/ipv6/ipv6.yml b/jjb/ipv6/ipv6.yml index 7d198303a..3453c79d7 100644 --- a/jjb/ipv6/ipv6.yml +++ b/jjb/ipv6/ipv6.yml @@ -18,8 +18,6 @@ - job-template: name: ipv6-test - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 10 @@ -39,7 +37,6 @@ # stream: branch with - in place of / (eg. stable) # branch: branch (eg. stable) - project-type: freestyle varsetabove: '{somevar}' logrotate: @@ -76,8 +73,6 @@ - job-template: name: 'ipv6-verify' - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 10 @@ -127,8 +122,6 @@ # # This job's purpose is to update all the JJB - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 40 @@ -166,8 +159,3 @@ find . echo "merge logic goes here" - - - - - diff --git a/jjb/kvmfornfv/kvmfornfv.yml b/jjb/kvmfornfv/kvmfornfv.yml index 69dad7735..8ce5edbf6 100644 --- a/jjb/kvmfornfv/kvmfornfv.yml +++ b/jjb/kvmfornfv/kvmfornfv.yml @@ -17,8 +17,6 @@ node: ericsson-build - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 10 @@ -73,8 +71,6 @@ node: ericsson-build - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 40 diff --git a/jjb/octopus/octopus.yml b/jjb/octopus/octopus.yml index 5f77e8a4d..1783bf641 100644 --- a/jjb/octopus/octopus.yml +++ b/jjb/octopus/octopus.yml @@ -28,8 +28,6 @@ - job-template: name: octopus-test - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 10 @@ -51,7 +49,6 @@ # stream: branch with - in place of / (eg. stable) # branch: branch (eg. stable) - project-type: freestyle varsetabove: '{somevar}' logrotate: @@ -90,8 +87,6 @@ node: master - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 10 @@ -141,8 +136,6 @@ # # This job's purpose is to update all the JJB - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 40 @@ -161,7 +154,6 @@ refspec: '' choosing-strategy: 'default' - triggers: - gerrit: trigger-on: @@ -179,7 +171,6 @@ - shell: !include-raw ../opnfvdocs/docu-build.sh - ######################## ## parameter macros ######################### diff --git a/jjb/opnfv/opnfv-docker.yml b/jjb/opnfv/opnfv-docker.yml index dfff050a9..93e7961db 100644 --- a/jjb/opnfv/opnfv-docker.yml +++ b/jjb/opnfv/opnfv-docker.yml @@ -23,8 +23,6 @@ - job-template: name: '{project}-docker-build-push-{stream}' - project-type: freestyle - node: ericsson-build disabled: false diff --git a/jjb/opnfv/opnfv-docs.yml b/jjb/opnfv/opnfv-docs.yml index f7e4c5bb4..62d6ad049 100644 --- a/jjb/opnfv/opnfv-docs.yml +++ b/jjb/opnfv/opnfv-docs.yml @@ -26,8 +26,6 @@ node: master - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 10 @@ -77,8 +75,6 @@ node: master - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 10 @@ -97,7 +93,6 @@ refspec: '$GERRIT_REFSPEC' choosing-strategy: 'gerrit' - triggers: - gerrit: trigger-on: diff --git a/jjb/oscar/oscar.yml b/jjb/oscar/oscar.yml index 9beb57593..81306824b 100644 --- a/jjb/oscar/oscar.yml +++ b/jjb/oscar/oscar.yml @@ -18,8 +18,6 @@ - job-template: name: oscar-test - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 10 @@ -39,7 +37,6 @@ # stream: branch with - in place of / (eg. stable) # branch: branch (eg. stable) - project-type: freestyle varsetabove: '{somevar}' logrotate: @@ -76,8 +73,6 @@ - job-template: name: 'oscar-verify' - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 10 @@ -127,8 +122,6 @@ # # This job's purpose is to update all the JJB - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 40 diff --git a/jjb/ovsnfv/ovsnfv.yml b/jjb/ovsnfv/ovsnfv.yml index 1c5810a03..4bfabffa6 100644 --- a/jjb/ovsnfv/ovsnfv.yml +++ b/jjb/ovsnfv/ovsnfv.yml @@ -16,8 +16,6 @@ node: opnfv-build - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 10 @@ -74,8 +72,6 @@ node: opnfv-build - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 40 @@ -121,7 +117,6 @@ cd $WORKSPACE/ci ./build.sh - - job-template: name: 'ovsnfv-daily-{stream}' @@ -129,8 +124,6 @@ disabled: true - project-type: freestyle - logrotate: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' diff --git a/jjb/parser/parser.yml b/jjb/parser/parser.yml index 22324c5fb..552522e7c 100644 --- a/jjb/parser/parser.yml +++ b/jjb/parser/parser.yml @@ -18,8 +18,6 @@ - job-template: name: parser-test - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 10 @@ -41,7 +39,6 @@ # stream: branch with - in place of / (eg. stable) # branch: branch (eg. stable) - project-type: freestyle varsetabove: '{somevar}' logrotate: @@ -78,8 +75,6 @@ node: master - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 10 @@ -129,8 +124,6 @@ # # This job's purpose is to update all the JJB - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 40 @@ -149,7 +142,6 @@ refspec: '' choosing-strategy: 'default' - triggers: - gerrit: trigger-on: diff --git a/jjb/pharos/pharos.yml b/jjb/pharos/pharos.yml index 9a80ab8dc..f1b1695d2 100644 --- a/jjb/pharos/pharos.yml +++ b/jjb/pharos/pharos.yml @@ -35,7 +35,6 @@ # stream: branch with - in place of / (eg. stable) # branch: branch (eg. stable) - project-type: freestyle varsetabove: '{somevar}' logrotate: @@ -74,8 +73,6 @@ node: master - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 10 @@ -125,8 +122,6 @@ # # This job's purpose is to update all the JJB - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 40 diff --git a/jjb/prediction/prediction.yml b/jjb/prediction/prediction.yml index 072affddf..c074f1899 100644 --- a/jjb/prediction/prediction.yml +++ b/jjb/prediction/prediction.yml @@ -18,8 +18,6 @@ - job-template: name: prediction-test - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 10 @@ -41,7 +39,6 @@ # stream: branch with - in place of / (eg. stable) # branch: branch (eg. stable) - project-type: freestyle varsetabove: '{somevar}' logrotate: @@ -78,8 +75,6 @@ node: master - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 10 @@ -129,8 +124,6 @@ # # This job's purpose is to update all the JJB - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 40 @@ -149,7 +142,6 @@ refspec: '' choosing-strategy: 'default' - triggers: - gerrit: trigger-on: diff --git a/jjb/qtip/qtip.yml b/jjb/qtip/qtip.yml index 0b863f7c4..d75ede0bf 100644 --- a/jjb/qtip/qtip.yml +++ b/jjb/qtip/qtip.yml @@ -8,18 +8,15 @@ - 'qtip-dhrystone-serial-{pod}' - 'qtip-ssl-parallel-{pod}' - # stream: branch with - in place of / (eg. stable-helium) # branch: branch (eg. stable/helium) - pod: - dell-build: node: 'dell-us-testing-bm-1' installer_type: 'fuel' installer_ip: '10.20.0.2' - stream: - master: branch: 'master' @@ -30,8 +27,6 @@ - job-template: name: qtip-test - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 10 @@ -51,7 +46,6 @@ # stream: branch with - in place of / (eg. stable) # branch: branch (eg. stable) - project-type: freestyle varsetabove: '{somevar}' logrotate: @@ -64,7 +58,6 @@ - project-parameter: project: '{project}' - scm: - git-scm: credentials-id: '{ssh-credentials}' @@ -89,8 +82,6 @@ - job-template: name: 'qtip-verify' - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 10 @@ -140,8 +131,6 @@ # # This job's purpose is to update all the JJB - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 40 @@ -182,8 +171,6 @@ - job-template: name: 'qtip-dhrystone-serial-{pod}' - project-type: freestyle - disabled: false node: '{node}' @@ -226,9 +213,6 @@ - job-template: name: 'qtip-ssl-parallel-{pod}' - - project-type: freestyle - disabled: false node: '{node}' @@ -286,7 +270,6 @@ echo "Running QTIP dhrystone with First Test case" python qtip.py -s compute -b dhrystone_serial.yaml - - builder: name: qtip-ssl-parallel @@ -302,7 +285,6 @@ echo "Running QTIP dhrystone with Second Test case" python qtip.py -s compute -b ssl_parallel.yaml - - builder: name: qtip-fetch-os-cred builders: diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml index 3ba2a23a4..000ba84cb 100644 --- a/jjb/releng-defaults.yaml +++ b/jjb/releng-defaults.yaml @@ -13,3 +13,5 @@ - ssh-agent-credentials: users: - '{ssh-credentials}' + + project-type: freestyle diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml index 6194bcd96..3b2b95df5 100644 --- a/jjb/releng-jobs.yaml +++ b/jjb/releng-jobs.yaml @@ -11,8 +11,6 @@ node: master - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 10 @@ -70,8 +68,6 @@ # # This job's purpose is to update all the JJB - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 40 diff --git a/jjb/storperf/storperf.yml b/jjb/storperf/storperf.yml index 2a3c42a6b..ed21bc777 100644 --- a/jjb/storperf/storperf.yml +++ b/jjb/storperf/storperf.yml @@ -18,8 +18,6 @@ node: intel-jp-build-1 - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 10 @@ -65,7 +63,6 @@ - shell: | $WORKSPACE/ci/verify.sh - - job-template: name: 'storperf-merge-{stream}' @@ -75,8 +72,6 @@ node: intel-jp-build-1 - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 40 @@ -120,7 +115,6 @@ - junit: results: nosetests.xml - - job-template: name: 'storperf-daily-{stream}' @@ -133,8 +127,6 @@ disabled: true - project-type: freestyle - logrotate: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' diff --git a/jjb/vnf_forwarding_graph/vnf_forwarding_graph.yml b/jjb/vnf_forwarding_graph/vnf_forwarding_graph.yml index 0d7e8b7e2..5a87bf441 100644 --- a/jjb/vnf_forwarding_graph/vnf_forwarding_graph.yml +++ b/jjb/vnf_forwarding_graph/vnf_forwarding_graph.yml @@ -18,8 +18,6 @@ - job-template: name: vnf_forwarding_graph-test - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 10 @@ -39,7 +37,6 @@ # stream: branch with - in place of / (eg. stable) # branch: branch (eg. stable) - project-type: freestyle varsetabove: '{somevar}' logrotate: @@ -76,8 +73,6 @@ - job-template: name: 'vnf_forwarding_graph-verify' - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 10 @@ -127,8 +122,6 @@ # # This job's purpose is to update all the JJB - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 40 @@ -166,8 +159,3 @@ find . echo "merge logic goes here" - - - - - diff --git a/jjb/vswitchperf/vswitchperf.yml b/jjb/vswitchperf/vswitchperf.yml index 9f767ced3..a7b78d1ab 100644 --- a/jjb/vswitchperf/vswitchperf.yml +++ b/jjb/vswitchperf/vswitchperf.yml @@ -14,7 +14,6 @@ project: 'vswitchperf' somevar: 'foo' - - job-template: name: 'vswitchperf-daily-{stream}' @@ -24,7 +23,6 @@ # stream: branch with - in place of / (eg. stable) # branch: branch (eg. stable) - project-type: freestyle varsetabove: '{somevar}' node: opnfv-build diff --git a/jjb/yardstick/yardstick.yml b/jjb/yardstick/yardstick.yml index 5afaaf723..b384102cb 100644 --- a/jjb/yardstick/yardstick.yml +++ b/jjb/yardstick/yardstick.yml @@ -30,8 +30,6 @@ - job-template: name: 'yardstick-verify' - project-type: freestyle - node: ericsson-build logrotate: @@ -97,8 +95,6 @@ # # This job's purpose is to update all the JJB - project-type: freestyle - node: ericsson-build logrotate: @@ -154,8 +150,6 @@ - job-template: name: 'yardstick-{installer}-{pod}-{stream}' - project-type: freestyle - disabled: false node: '{node}' -- 2.16.6