diff options
Diffstat (limited to 'jjb')
35 files changed, 79 insertions, 434 deletions
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml index 716e1954b..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}' @@ -176,8 +170,8 @@ builders: - 'apex-build' - - 'apex-upload-artifact' - 'apex-deploy-virtual' + - 'apex-upload-artifact' - 'apex-workspace-cleanup' - trigger-builds: - project: 'functest-apex-{stream}' @@ -312,20 +306,9 @@ echo "--------------------------------------------------------" echo - # check if we got the file - if [[ -f opnfv.properties ]]; then - # source the file so we get OPNFV vars - source opnfv.properties - RPM_INSTALL_PATH=build_output/$(basename $OPNFV_RPM_URL) - else - # get the latest.properties file in order to get info regarding latest artifact - curl -s -o $WORKSPACE/opnfv.properties http://$GS_URL/latest.properties - [[ -f opnfv.properties ]] || exit 1 - - # source the file so we get OPNFV vars - source opnfv.properties - RPM_INSTALL_PATH=$RPM_URL - fi + # source the file so we get OPNFV vars + source opnfv.properties + RPM_INSTALL_PATH=build_output/$(basename $OPNFV_RPM_URL) # update / install the new rpm if rpm -q opnfv-apex > /dev/null; then diff --git a/jjb/armband/armband.yml b/jjb/armband/armband.yml index 81710d265..379a8aecb 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 @@ -33,15 +31,12 @@ - job-template: name: 'armband-daily-{stream}' - node: master - # Job template for daily builders # # Required Variables: # stream: branch with - in place of / (eg. stable) # branch: branch (eg. stable) - project-type: freestyle varsetabove: '{somevar}' logrotate: @@ -80,8 +75,6 @@ node: ericsson-build - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 10 @@ -131,14 +124,10 @@ - job-template: name: 'armband-merge' - node: master - # builder-merge job to run JJB update # # 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..10fdf6ef5 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 @@ -38,9 +36,7 @@ # Required Variables: # stream: branch with - in place of / (eg. stable) # branch: branch (eg. stable) - node: master - project-type: freestyle varsetabove: '{somevar}' logrotate: @@ -75,10 +71,6 @@ - job-template: name: 'availability-verify' - node: master - - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 10 @@ -126,10 +118,6 @@ # # This job's purpose is to update all the JJB - node: master - - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 40 @@ -165,8 +153,3 @@ - shell: !include-raw docu-build.sh - - - - - diff --git a/jjb/bottlenecks/bottlenecks.yml b/jjb/bottlenecks/bottlenecks.yml index 049a51eef..582fbec5a 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 @@ -38,15 +36,12 @@ - job-template: name: 'bottlenecks-daily-{stream}' - node: master - # Job template for daily builders # # Required Variables: # stream: branch with - in place of / (eg. stable) # branch: branch (eg. stable) - project-type: freestyle varsetabove: '{somevar}' logrotate: @@ -81,10 +76,6 @@ - job-template: name: 'bottlenecks-verify' - node: master - - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 10 @@ -128,14 +119,10 @@ - job-template: name: 'bottlenecks-merge' - node: master - # builder-merge job to run JJB update # # 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..a93af98ec 100644 --- a/jjb/doctor/doctor.yml +++ b/jjb/doctor/doctor.yml @@ -13,8 +13,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..1566109a4 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,12 +356,8 @@ - job-template: name: 'fuel-lab-reconfig-{stream}' - project-type: freestyle - disabled: true - node: master - logrotate: daysToKeep: 30 numToKeep: 10 diff --git a/jjb/functest/functest.yml b/jjb/functest/functest.yml index f6cd15cac..96b770ba2 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: @@ -313,15 +284,12 @@ - job-template: name: 'functest-daily-{stream}' - node: master - # Job template for daily builders # # Required Variables: # stream: branch with - in place of / (eg. stable) # branch: branch (eg. stable) - project-type: freestyle varsetabove: '{somevar}' logrotate: @@ -358,10 +326,6 @@ - job-template: name: 'functest-verify-{stream}' - node: master - - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 10 @@ -405,14 +369,10 @@ - job-template: name: 'functest-merge-{stream}' - node: master - # builder-merge job to run JJB update # # This job's purpose is to update all the JJB - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 40 @@ -515,7 +475,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 +511,6 @@ echo "Executing command inside the docker: ${cmd}" docker exec ${container_id} ${cmd} - - builder: name: functest-vping builders: @@ -590,8 +548,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 +560,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 +572,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: @@ -636,17 +589,16 @@ # Remove previous running containers if exist if [[ ! -z $(docker ps -a | grep opnfv/functest) ]]; then echo "Removing existing opnfv/functest containers..." - docker ps | grep opnfv/functest | awk '{{print $1}}' | xargs docker stop - docker ps -a | grep opnfv/functest | awk '{{print $1}}' | xargs docker rm + docker ps | grep opnfv/functest | awk '{print $1}' | xargs docker stop + 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:" docker images | head -1 && docker images | grep opnfv/functest - image_tags=($(docker images | grep opnfv/functest | awk '{{print $2}}')) - for tag in "${{image_tags[@]}}"; do + image_tags=($(docker images | grep opnfv/functest | awk '{print $2}')) + for tag in "${image_tags[@]}"; do echo "Removing docker image opnfv/functest:$tag..." docker rmi opnfv/functest:$tag done 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..b12e32041 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,12 +243,8 @@ - job-template: name: 'genesis-foreman-deploy-runner-{stream}' - project-type: freestyle - disabled: false - node: master - logrotate: daysToKeep: 30 numToKeep: 10 @@ -296,8 +286,6 @@ - job-template: name: 'genesis-foreman-build-{stream}' - project-type: freestyle - node: ericsson-build logrotate: @@ -326,8 +314,6 @@ - job-template: name: 'genesis-foreman-deploy-{stream}' - project-type: freestyle - disabled: false node: opnfv-jump-2 @@ -361,12 +347,8 @@ - job-template: name: 'genesis-foreman-lab-reconfig-{stream}' - project-type: freestyle - disabled: false - node: master - logrotate: daysToKeep: 30 numToKeep: 10 @@ -402,8 +384,6 @@ - job-template: name: 'genesis-foreman-verify-deploy-virtual-{stream}' - project-type: freestyle - node: opnfv-jump-1 disabled: true @@ -472,7 +452,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..fca14298d 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,12 +254,8 @@ - job-template: name: 'genesis-fuel-deploy-runner-{stream}' - project-type: freestyle - disabled: false - node: master - logrotate: daysToKeep: 30 numToKeep: 10 @@ -307,8 +297,6 @@ - job-template: name: 'genesis-fuel-build-{stream}' - project-type: freestyle - node: ericsson-build logrotate: @@ -342,8 +330,6 @@ - job-template: name: 'genesis-fuel-deploy-{stream}' - project-type: freestyle - disabled: false node: opnfv-jump-2 @@ -382,12 +368,8 @@ - job-template: name: 'genesis-fuel-lab-reconfig-{stream}' - project-type: freestyle - disabled: false - node: master - logrotate: daysToKeep: 30 numToKeep: 10 @@ -423,8 +405,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..33d45ccd6 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 @@ -43,15 +41,12 @@ - job-template: name: 'octopus-daily-{stream}' - node: master - # Job template for daily builders # # Required Variables: # stream: branch with - in place of / (eg. stable) # branch: branch (eg. stable) - project-type: freestyle varsetabove: '{somevar}' logrotate: @@ -88,10 +83,6 @@ - job-template: name: 'octopus-verify-{stream}' - node: master - - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 10 @@ -135,14 +126,10 @@ - job-template: name: 'octopus-merge-{stream}' - node: master - # builder-merge job to run JJB update # # This job's purpose is to update all the JJB - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 40 @@ -161,7 +148,6 @@ refspec: '' choosing-strategy: 'default' - triggers: - gerrit: trigger-on: @@ -179,7 +165,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..bae9c4095 100644 --- a/jjb/opnfv/opnfv-docs.yml +++ b/jjb/opnfv/opnfv-docs.yml @@ -24,10 +24,6 @@ - job-template: name: 'opnfv-docs-verify' - node: master - - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 10 @@ -75,10 +71,6 @@ - job-template: name: 'opnfv-docs-merge' - node: master - - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 10 @@ -97,7 +89,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 5cc4d6afd..4bfabffa6 100644 --- a/jjb/ovsnfv/ovsnfv.yml +++ b/jjb/ovsnfv/ovsnfv.yml @@ -1,12 +1,10 @@ - project: name: ovsnfv jobs: - - 'ovsnfv-verify' - - 'ovsnfv-merge' + - 'ovsnfv-verify-{stream}' + - 'ovsnfv-merge-{stream}' - 'ovsnfv-daily-{stream}' - # stream: branch with - in place of / (eg. stable-arno) - # branch: branch (eg. stable/arno) stream: - master: branch: 'master' @@ -14,11 +12,9 @@ project: 'ovsnfv' - job-template: - name: 'ovsnfv-verify' + name: 'ovsnfv-verify-{stream}' - node: ericsson-build - - project-type: freestyle + node: opnfv-build logrotate: daysToKeep: 30 @@ -62,19 +58,19 @@ branch-pattern: '**/master' builders: - - shell: - echo "Hello World" - -- job-template: - name: 'ovsnfv-merge' + - shell: | + #!/bin/bash + set -o errexit + set -o nounset + set -o pipefail - # builder-merge job to run JJB update - # - # This job's purpose is to update all the JJB + cd $WORKSPACE/ci + ./build.sh - node: master +- job-template: + name: 'ovsnfv-merge-{stream}' - project-type: freestyle + node: opnfv-build logrotate: daysToKeep: 30 @@ -112,24 +108,22 @@ branch-pattern: '**/master' builders: - - shell: - echo "Hello World" + - shell: | + #!/bin/bash + set -o errexit + set -o nounset + set -o pipefail + cd $WORKSPACE/ci + ./build.sh - job-template: name: 'ovsnfv-daily-{stream}' - # Job template for daily builders - # - # Required Variables: - # stream: branch with - in place of / (eg. stable) - # branch: branch (eg. stable) - node: master + node: opnfv-build disabled: true - project-type: freestyle - logrotate: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' @@ -139,6 +133,10 @@ parameters: - project-parameter: project: '{project}' + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: "Used for overriding the GIT URL coming from Global Jenkins configuration in case if the stuff is done on none-LF HW." scm: - git-scm: @@ -147,8 +145,14 @@ branch: '{branch}' triggers: - - timed: 'H H * * *' + - timed: '@midnight' builders: - - shell: - echo "Hello World" + - shell: | + #!/bin/bash + set -o errexit + set -o nounset + set -o pipefail + + cd $WORKSPACE/ci + ./build.sh diff --git a/jjb/parser/parser.yml b/jjb/parser/parser.yml index efb06ea74..463d64b81 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 @@ -33,15 +31,12 @@ - job-template: name: 'parser-daily-{stream}' - node: master - # Job template for daily builders # # Required Variables: # stream: branch with - in place of / (eg. stable) # branch: branch (eg. stable) - project-type: freestyle varsetabove: '{somevar}' logrotate: @@ -76,10 +71,6 @@ - job-template: name: 'parser-verify' - node: master - - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 10 @@ -117,20 +108,16 @@ branch-pattern: '**/master' builders: - - shell: - !include-raw docu-build.sh + - shell: | + echo "Hello world from parser" - job-template: name: 'parser-merge' - node: master - # builder-merge job to run JJB update # # This job's purpose is to update all the JJB - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 40 @@ -149,7 +136,6 @@ refspec: '' choosing-strategy: 'default' - triggers: - gerrit: trigger-on: diff --git a/jjb/pharos/pharos.yml b/jjb/pharos/pharos.yml index ab6705b14..6ab54598d 100644 --- a/jjb/pharos/pharos.yml +++ b/jjb/pharos/pharos.yml @@ -4,10 +4,10 @@ - project: name: pharos jobs: - - 'pharos-test' - 'pharos-daily-{stream}' - 'pharos-merge-{stream}' - 'pharos-verify-{stream}' + - 'pharos-maas-pilot-{stream}' # stream: branch with - in place of / (eg. stable-arno) # branch: branch (eg. stable/arno) @@ -25,32 +25,14 @@ # job template ############################## - job-template: - name: pharos-test - - project-type: freestyle - - logrotate: - daysToKeep: 30 - numToKeep: 10 - artifactDaysToKeep: -1 - artifactNumToKeep: -1 - - builders: - - shell: | - echo "Hello world from pharos" - -- job-template: name: 'pharos-daily-{stream}' - node: master - # Job template for daily builders # # Required Variables: # stream: branch with - in place of / (eg. stable) # branch: branch (eg. stable) - project-type: freestyle varsetabove: '{somevar}' logrotate: @@ -87,10 +69,6 @@ - job-template: name: 'pharos-verify-{stream}' - node: master - - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 10 @@ -134,14 +112,10 @@ - job-template: name: 'pharos-merge-{stream}' - node: master - # builder-merge job to run JJB update # # This job's purpose is to update all the JJB - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 40 @@ -177,6 +151,35 @@ - shell: !include-raw ../opnfvdocs/docu-build.sh +- 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}' + + scm: + - git-scm: + credentials-id: '{ssh-credentials}' + refspec: '' + branch: '{branch}' + + triggers: + - pollscm: '@midnight' + + builders: + - shell: + echo "Hello World" ######################## # parameter macros ######################## diff --git a/jjb/prediction/prediction.yml b/jjb/prediction/prediction.yml index 072affddf..76fcef208 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 @@ -33,15 +31,12 @@ - job-template: name: 'prediction-daily-{stream}' - node: master - # Job template for daily builders # # Required Variables: # stream: branch with - in place of / (eg. stable) # branch: branch (eg. stable) - project-type: freestyle varsetabove: '{somevar}' logrotate: @@ -76,10 +71,6 @@ - job-template: name: 'prediction-verify' - node: master - - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 10 @@ -123,14 +114,10 @@ - job-template: name: 'prediction-merge' - node: master - # builder-merge job to run JJB update # # This job's purpose is to update all the JJB - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 40 @@ -149,7 +136,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..faf3ea6f9 100644 --- a/jjb/releng-defaults.yaml +++ b/jjb/releng-defaults.yaml @@ -13,3 +13,7 @@ - ssh-agent-credentials: users: - '{ssh-credentials}' + + project-type: freestyle + + node: master diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml index 6194bcd96..bd300fde0 100644 --- a/jjb/releng-jobs.yaml +++ b/jjb/releng-jobs.yaml @@ -9,10 +9,6 @@ - job-template: name: builder-verify-jjb - node: master - - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 10 @@ -64,14 +60,10 @@ - job-template: name: 'builder-merge' - node: master - # builder-merge job to run JJB update # # 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}' |