diff options
Diffstat (limited to 'jjb')
38 files changed, 284 insertions, 796 deletions
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml index cb0a0f369..b00674bfd 100644 --- a/jjb/apex/apex.yml +++ b/jjb/apex/apex.yml @@ -3,6 +3,9 @@ jobs: - 'apex-verify-{stream}' - 'apex-merge-{stream}' + - 'apex-build-{stream}' + - 'apex-deploy-virtual-{stream}' + - 'apex-deploy-baremetal-{stream}' - 'apex-daily-{stream}' # stream: branch with - in place of / (eg. stable-arno) @@ -21,8 +24,6 @@ node: opnfv-jump-1 - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 10 @@ -70,6 +71,12 @@ - compare-type: ANT pattern: 'docs/**' + properties: + - build-blocker: + use-build-blocker: true + blocking-jobs: + - "apex-daily.*" + builders: - 'apex-build' - 'apex-deploy-virtual' @@ -84,14 +91,6 @@ node: opnfv-jump-1 - project-type: freestyle - - logrotate: - daysToKeep: 30 - numToKeep: 40 - artifactDaysToKeep: -1 - artifactNumToKeep: 5 - parameters: - apex-parameter: gs-pathname: '{gs-pathname}' @@ -133,9 +132,9 @@ - 'apex-workspace-cleanup' - job-template: - name: 'apex-daily-{stream}' + name: 'apex-build-{stream}' - # Job template for daily builders + # Job template for builds # # Required Variables: # stream: branch with - in place of / (eg. stable) @@ -144,14 +143,6 @@ disabled: false - 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}' @@ -179,6 +170,87 @@ - 'apex-deploy-virtual' - 'apex-upload-artifact' - 'apex-workspace-cleanup' + +- job-template: + name: 'apex-deploy-virtual-{stream}' + + # Job template for virtual deployment + # + # Required Variables: + # stream: branch with - in place of / (eg. stable) + # branch: branch (eg. stable) + node: opnfv-jump-1 + + disabled: false + + parameters: + - project-parameter: + project: '{project}' + - apex-parameter: + gs-pathname: '{gs-pathname}' + flags: '{flags}' + + builders: + - 'apex-deploy-virtual' + - 'apex-workspace-cleanup' + +- job-template: + name: 'apex-deploy-baremetal-{stream}' + + # Job template for baremetal deployment + # + # Required Variables: + # stream: branch with - in place of / (eg. stable) + # branch: branch (eg. stable) + node: opnfv-jump-1 + + disabled: true + + parameters: + - project-parameter: + project: '{project}' + - apex-parameter: + gs-pathname: '{gs-pathname}' + flags: '{flags}' + + builders: + - 'apex-workspace-cleanup' + +- job-template: + name: 'apex-daily-{stream}' + + # Job template for daily build + # + # Required Variables: + # stream: branch with - in place of / (eg. stable) + # branch: branch (eg. stable) + node: opnfv-jump-1 + + disabled: false + + parameters: + - project-parameter: + project: '{project}' + - apex-parameter: + gs-pathname: '{gs-pathname}' + flags: '{flags}' + + properties: + - build-blocker: + use-build-blocker: true + blocking-jobs: + - "apex-daily.*" + builders: + - trigger-builds: + - project: 'apex-build-{stream}' + git-revision: true + block: true + - trigger-builds: + - project: 'apex-deploy-virtual-{stream}' + git-revision: true + block: true + - trigger-builds: + - project: 'apex-deploy-baremetal-{stream}' - trigger-builds: - project: 'functest-apex-{stream}' block: true @@ -194,6 +266,10 @@ name: apex-parameter parameters: - string: + name: ARTIFACT_NAME + default: '' + description: "RPM Artifact name that will be appended to GS_URL to deploy a specific artifact" + - string: name: BUILD_DIRECTORY default: $WORKSPACE/build_output description: "Directory where the build artifact will be located upon the completion of the build." @@ -312,7 +388,27 @@ echo "--------------------------------------------------------" echo - # source the file so we get OPNFV vars + if [[ -z "$ARTIFACT_NAME" ]]; then + # if artifact name is passed the pull a + # specific artifact from artifacts.opnfv.org + RPM_INSTALL_PATH=$GS_URL/$ARTIFACT_NAME + else + if [[ -f opnfv.properties ]]; then + # if opnfv.properties exists then use the + # local build. Source the file so we get local OPNFV vars + source opnfv.properties + RPM_INSTALL_PATH=build_output/$(basename $OPNFV_RPM_URL) + else + # no opnfv.properties means use the latest from artifacts.opnfv.org + # get the latest.properties to get the link to the 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 + fi + source opnfv.properties RPM_INSTALL_PATH=build_output/$(basename $OPNFV_RPM_URL) diff --git a/jjb/armband/armband.yml b/jjb/armband/armband.yml index 81710d265..cb5dc95c1 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,23 +31,14 @@ - 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: - 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}' @@ -80,8 +69,6 @@ node: ericsson-build - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 10 @@ -131,20 +118,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 - artifactDaysToKeep: -1 - artifactNumToKeep: 5 - parameters: - project-parameter: project: '{project}' diff --git a/jjb/availability/availability.yml b/jjb/availability/availability.yml index 6bb068b49..741fd8299 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,17 +36,9 @@ # Required Variables: # stream: branch with - in place of / (eg. stable) # branch: branch (eg. stable) - node: master - project-type: freestyle 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}' @@ -75,10 +65,6 @@ - job-template: name: 'availability-verify' - node: master - - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 10 @@ -126,16 +112,6 @@ # # This job's purpose is to update all the JJB - node: master - - project-type: freestyle - - logrotate: - daysToKeep: 30 - numToKeep: 40 - artifactDaysToKeep: -1 - artifactNumToKeep: 5 - parameters: - project-parameter: project: '{project}' @@ -165,8 +141,3 @@ - shell: !include-raw docu-build.sh - - - - - diff --git a/jjb/bottlenecks/bottlenecks.yml b/jjb/bottlenecks/bottlenecks.yml index 049a51eef..b2d74eba7 100644 --- a/jjb/bottlenecks/bottlenecks.yml +++ b/jjb/bottlenecks/bottlenecks.yml @@ -6,11 +6,20 @@ jobs: - 'bottlenecks-test' - 'bottlenecks-verify' - - 'bottlenecks-daily-{stream}' - 'bottlenecks-merge' + - 'bottlenecks-daily-{installer}-{pod}-{stream}' # stream: branch with - in place of / (eg. stable-arno) # branch: branch (eg. stable/arno) + pod: + - lf: + node: 'opnfv-jump-2' + installer_type: 'fuel' + installer_ip: '10.20.0.2' + + installer: + -fuel + stream: - master: branch: 'master' @@ -23,8 +32,6 @@ - job-template: name: 'bottlenecks-test' - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 10 @@ -36,55 +43,9 @@ echo "Hello world from bottlenecks" - 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: - daysToKeep: 30 - numToKeep: 10 - artifactDaysToKeep: -1 - artifactNumToKeep: -1 - - parameters: - - project-parameter: - project: '{project}' - - scm: - - git-scm: - credentials-id: '{ssh-credentials}' - refspec: '' - branch: '{branch}' - - triggers: - - timed: 'H H * * *' - - prebuilders: - - test-macro - - builders: - - shell: | - echo "hello world" - - postbuilders: - - test-macro - -- job-template: name: 'bottlenecks-verify' - node: master - - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 10 @@ -128,14 +89,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 @@ -171,3 +128,107 @@ - shell: | echo "hello world" +- job-template: + name: 'bottlenecks-daily-{installer}-{pod}-{stream}' + + disabled: false + + node: '{node}' + + parameters: + - project-parameter: + project: '{project}' + - '{pod}-parameters' + - string: + name: POD_NAME + default: '{pod}' + description: "POD where the job runs" + - string: + name: INSTALLER_TYPE + default: '{installer_type}' + description: "Installer name that is used for deployment." + - string: + name: INSTALLER_IP + default: '{installer_ip}' + description: "Installer IP." + + scm: + - git-scm: + credentials-id: '{ssh-credentials}' + refspec: '' + branch: '{branch}' + + logrotate: + daysToKeep: 30 + numToKeep: 10 + artifactDaysToKeep: -1 + artifactNumToKeep: -1 + + triggers: + - 'bottlenecks-trigger-{pod}' + + builders: + - 'bottlenecks-fetch-os-creds' + - 'run-rubbos-env-preparation' + - 'run-rubbos-tools-installation' + - 'rubbos-exec' + + publishers: + - email: + recipients: hongbo.tianhongbo@huawei.com matthew.lijun@huawei.com + +################################### +#builders for bottlenecks project +################################### +- builder: + name: bottlenecks-fetch-os-creds + builders: + - shell: + !include-raw ../../utils/fetch_os_creds.sh + +- builder: + name: run-rubbos-env-preparation + builders: + - shell: | + #!/bin/bash + set -o errexit + + echo "Bottlenecks: export openstack parameters before rubbos running" + + cd $WORKSPACE + ./rubbos/rubbos_scripts/1-1-1/scripts/env_preparation.sh + +- builder: + name: run-rubbos-tools-installation + builders: + - shell: | + #!/bin/bash + set -o errexit + + echo "Bottlenecks: to install tools to run rubbos" + + cd $WORKSPACE + ./rubbos/rubbos_scripts/1-1-1/scripts/run.sh + +- builder: + name: rubbos-exec + builders: + - shell: | + #!/bin/bash + set -o errexit + + echo "Bottlenecks: rubbos execution" + + cd $WORKSPACE + cd ./rubbos/rubbos_scripts/1-1-1 + source set_bottlenecks_rubbos_env.sh + ssh $CONTROL_HOST + ./tmp/CONTROL_rubbos_exec.sh + +####################### +#trigger macros +####################### +- trigger: + name: 'bottlenecks-trigger-lf' + triggers: + - timed: '@midnight' diff --git a/jjb/compass4nfv/compass4nfv.yml b/jjb/compass4nfv/compass4nfv.yml index 0e41e1ba6..74f9a4539 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 @@ -127,12 +122,6 @@ max-total: 3 max-per-node: 1 - logrotate: - daysToKeep: 30 - numToKeep: 40 - artifactDaysToKeep: -1 - artifactNumToKeep: 5 - parameters: - project-parameter: project: '{project}' @@ -166,8 +155,6 @@ - job-template: name: 'compass-daily-{stream}' - project-type: freestyle - node: huawei-build concurrent: true @@ -220,8 +207,6 @@ - job-template: name: 'compass-build-iso' - project-type: freestyle - node: ericsson-build concurrent: true @@ -260,8 +245,6 @@ description: "build ppa(using docker) in huawei lab" - project-type: freestyle - node: huawei-build concurrent: true @@ -299,8 +282,6 @@ - job-template: name: 'compass-deploy-virtual-{flavor}' - project-type: freestyle - disabled: false node: '{node}' @@ -323,14 +304,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 +320,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 +358,6 @@ allow-empty: 'true' fingerprint: true - ######################## # parameter macros ######################## @@ -587,7 +562,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..5d1e57803 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,15 +37,8 @@ # stream: branch with - in place of / (eg. stable) # branch: branch (eg. stable) - project-type: freestyle 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}' @@ -76,8 +67,6 @@ - job-template: name: 'conductor-verify' - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 10 @@ -127,14 +116,6 @@ # # This job's purpose is to update all the JJB - project-type: freestyle - - logrotate: - daysToKeep: 30 - numToKeep: 40 - artifactDaysToKeep: -1 - artifactNumToKeep: 5 - parameters: - project-parameter: project: '{project}' 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..d356b2c8e 100644 --- a/jjb/doctor/doctor.yml +++ b/jjb/doctor/doctor.yml @@ -13,13 +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}' - 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 d027f47fe..0a4e6e417 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,15 +37,8 @@ # stream: branch with - in place of / (eg. stable) # branch: branch (eg. stable) - project-type: freestyle 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}' @@ -76,8 +67,6 @@ - job-template: name: 'dpacc-verify' - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 10 @@ -127,14 +116,6 @@ # # This job's purpose is to update all the JJB - project-type: freestyle - - 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 6c7edaa67..191597631 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,15 +37,8 @@ # stream: branch with - in place of / (eg. stable) # branch: branch (eg. stable) - project-type: freestyle 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}' @@ -76,8 +67,6 @@ - job-template: name: 'fastpathmetrics-verify' - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 10 @@ -127,14 +116,6 @@ # # This job's purpose is to update all the JJB - project-type: freestyle - - logrotate: - daysToKeep: 30 - numToKeep: 40 - artifactDaysToKeep: -1 - artifactNumToKeep: 5 - parameters: - project-parameter: project: '{project}' @@ -166,8 +147,3 @@ find . echo "merge logic goes here" - - - - - diff --git a/jjb/fuel/fuel-deploy-virtual.sh b/jjb/fuel/fuel-deploy-virtual.sh index a65395b07..626a65060 100755 --- a/jjb/fuel/fuel-deploy-virtual.sh +++ b/jjb/fuel/fuel-deploy-virtual.sh @@ -18,7 +18,7 @@ chmod a+x $HOME chmod a+x $TMPDIR # set CONFDIR, BRIDGE -CONFDIR=$WORKSPACE/deploy/templates/virtual_environment/conf +CONFDIR=$WORKSPACE/deploy/templates/virtual_environment_noha/conf BRIDGE=pxebr # log info to console diff --git a/jjb/fuel/fuel-upload-artifact.sh b/jjb/fuel/fuel-upload-artifact.sh index 2783f2cd0..b998e6a6a 100755 --- a/jjb/fuel/fuel-upload-artifact.sh +++ b/jjb/fuel/fuel-upload-artifact.sh @@ -14,7 +14,7 @@ source $WORKSPACE/opnfv.properties # upload artifact and additional files to google storage gsutil cp $BUILD_DIRECTORY/opnfv-$OPNFV_ARTIFACT_VERSION.iso gs://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.iso > gsutil.iso.log 2>&1 gsutil cp $WORKSPACE/opnfv.properties gs://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.properties > gsutil.properties.log 2>&1 -if [[ "$JOB_NAME" =~ "daily" ]]; then +if [[ ! "$JOB_NAME" =~ (verify|merge) ]]; then gsutil cp $WORKSPACE/opnfv.properties gs://$GS_URL/latest.properties > gsutil.latest.log 2>&1 elif [[ "$JOB_NAME" =~ "merge" ]]; then echo "Uploaded Fuel ISO for a merged change" diff --git a/jjb/fuel/fuel.yml b/jjb/fuel/fuel.yml index c0ba580de..97fc9ed3f 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 @@ -109,12 +105,6 @@ enabled: true max-total: 2 - logrotate: - daysToKeep: 30 - numToKeep: 40 - artifactDaysToKeep: -1 - artifactNumToKeep: 5 - parameters: - project-parameter: project: '{project}' @@ -160,8 +150,6 @@ - job-template: name: 'fuel-merge-deploy-virtual-{stream}' - project-type: freestyle - node: fuel-deploy-virtual concurrent: true @@ -172,12 +160,6 @@ max-total: 2 max-per-node: 1 - logrotate: - daysToKeep: 30 - numToKeep: 40 - artifactDaysToKeep: -1 - artifactNumToKeep: 5 - parameters: - project-parameter: project: '{project}' @@ -225,8 +207,6 @@ - job-template: name: 'fuel-daily-{stream}' - project-type: freestyle - node: ericsson-build disabled: false @@ -247,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}' @@ -276,6 +250,13 @@ build-step-failure-threshold: 'never' failure-threshold: 'never' unstable-threshold: 'FAILURE' + - trigger-builds: + - project: 'bottlenecks-daily-fuel-lf-{stream}' + block: true + block-thresholds: + build-step-failure-threshold: 'never' + failure-threshold: 'never' + unstable-threshold: 'FAILURE' triggers: - 'fuel-{stream}-daily-trigger' @@ -283,8 +264,6 @@ - job-template: name: 'fuel-build-{stream}' - project-type: freestyle - node: ericsson-build logrotate: @@ -326,8 +305,6 @@ - job-template: name: 'fuel-deploy-{stream}' - project-type: freestyle - disabled: false node: opnfv-jump-2 @@ -368,12 +345,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 47024e20e..53da3eec5 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,23 +284,14 @@ - 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: - 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}' @@ -358,10 +320,6 @@ - job-template: name: 'functest-verify-{stream}' - node: master - - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 10 @@ -405,20 +363,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 - artifactDaysToKeep: -1 - artifactNumToKeep: 5 - parameters: - project-parameter: project: '{project}' @@ -515,7 +463,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: @@ -530,10 +477,10 @@ envs="INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP}" docker pull opnfv/functest:latest_stable echo "Functest: Running docker run command: docker run -i -e $envs opnfv/functest /bin/bash &" - docker run -i -e $envs opnfv/functest /bin/bash & + docker run -i -e $envs opnfv/functest:latest_stable /bin/bash & docker ps -a sleep 5 - container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1) + container_id=$(docker ps | grep 'opnfv/functest:latest_stable' | awk '{print $1}' | head -1) echo "Container ID=${container_id}" if [ -z ${container_id} ]; then echo "Cannot find opnfv/functest container ID ${container_id}. Please check if it is existing." @@ -544,7 +491,7 @@ docker start ${container_id} sleep 5 docker ps - if [ $(docker ps | grep opnfv/functest | wc -l) == 0 ]; then + if [ $(docker ps | grep 'opnfv/functest:latest_stable' | wc -l) == 0 ]; then echo "The container opnfv/functest with ID=${container_id} has not been properly started. Exiting..." exit 1 fi @@ -552,7 +499,6 @@ echo "Executing command inside the docker: ${cmd}" docker exec ${container_id} ${cmd} - - builder: name: functest-vping builders: @@ -590,8 +536,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 +548,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 +560,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 +581,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..fa8b35aed 100644 --- a/jjb/genesis/genesis-docs.yml +++ b/jjb/genesis/genesis-docs.yml @@ -27,14 +27,6 @@ node: gce-opnfv-docker-1 - project-type: freestyle - - logrotate: - daysToKeep: 30 - numToKeep: 40 - artifactDaysToKeep: -1 - artifactNumToKeep: 5 - parameters: - project-parameter: project: '{project}' @@ -89,14 +81,6 @@ node: gce-opnfv-docker-1 - project-type: freestyle - - logrotate: - daysToKeep: 30 - numToKeep: 40 - artifactDaysToKeep: -1 - artifactNumToKeep: 5 - parameters: - project-parameter: project: '{project}' @@ -109,7 +93,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..1d0bce945 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 @@ -125,12 +121,6 @@ enabled: true max-total: 2 - logrotate: - daysToKeep: 30 - numToKeep: 40 - artifactDaysToKeep: -1 - artifactNumToKeep: 5 - parameters: - project-parameter: project: '{project}' @@ -185,8 +175,6 @@ - job-template: name: 'genesis-foreman-daily-{stream}' - project-type: freestyle - node: ericsson-build disabled: '{obj:disabled}' @@ -249,12 +237,8 @@ - job-template: name: 'genesis-foreman-deploy-runner-{stream}' - project-type: freestyle - disabled: false - node: master - logrotate: daysToKeep: 30 numToKeep: 10 @@ -296,8 +280,6 @@ - job-template: name: 'genesis-foreman-build-{stream}' - project-type: freestyle - node: ericsson-build logrotate: @@ -326,8 +308,6 @@ - job-template: name: 'genesis-foreman-deploy-{stream}' - project-type: freestyle - disabled: false node: opnfv-jump-2 @@ -361,12 +341,8 @@ - job-template: name: 'genesis-foreman-lab-reconfig-{stream}' - project-type: freestyle - disabled: false - node: master - logrotate: daysToKeep: 30 numToKeep: 10 @@ -402,8 +378,6 @@ - job-template: name: 'genesis-foreman-verify-deploy-virtual-{stream}' - project-type: freestyle - node: opnfv-jump-1 disabled: true @@ -472,7 +446,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..2ae748d96 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 @@ -131,12 +127,6 @@ enabled: true max-total: 2 - logrotate: - daysToKeep: 30 - numToKeep: 40 - artifactDaysToKeep: -1 - artifactNumToKeep: 5 - parameters: - project-parameter: project: '{project}' @@ -196,8 +186,6 @@ - job-template: name: 'genesis-fuel-daily-{stream}' - project-type: freestyle - node: ericsson-build disabled: '{obj:disabled}' @@ -260,12 +248,8 @@ - job-template: name: 'genesis-fuel-deploy-runner-{stream}' - project-type: freestyle - disabled: false - node: master - logrotate: daysToKeep: 30 numToKeep: 10 @@ -307,8 +291,6 @@ - job-template: name: 'genesis-fuel-build-{stream}' - project-type: freestyle - node: ericsson-build logrotate: @@ -342,8 +324,6 @@ - job-template: name: 'genesis-fuel-deploy-{stream}' - project-type: freestyle - disabled: false node: opnfv-jump-2 @@ -382,12 +362,8 @@ - job-template: name: 'genesis-fuel-lab-reconfig-{stream}' - project-type: freestyle - disabled: false - node: master - logrotate: daysToKeep: 30 numToKeep: 10 @@ -423,8 +399,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..3867d4e2d 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,16 +85,8 @@ # # This job's purpose is to update all the JJB - project-type: freestyle - node: ericsson-build - logrotate: - daysToKeep: 30 - numToKeep: 40 - artifactDaysToKeep: -1 - artifactNumToKeep: 5 - parameters: - string: name: BUILD_DIRECTORY @@ -140,8 +129,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..cfab89186 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,15 +37,8 @@ # stream: branch with - in place of / (eg. stable) # branch: branch (eg. stable) - project-type: freestyle 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}' @@ -76,8 +67,6 @@ - job-template: name: 'ipv6-verify' - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 10 @@ -127,14 +116,6 @@ # # This job's purpose is to update all the JJB - project-type: freestyle - - logrotate: - daysToKeep: 30 - numToKeep: 40 - artifactDaysToKeep: -1 - artifactNumToKeep: 5 - parameters: - project-parameter: project: '{project}' @@ -166,8 +147,3 @@ find . echo "merge logic goes here" - - - - - diff --git a/jjb/kvmfornfv/kvmfornfv.yml b/jjb/kvmfornfv/kvmfornfv.yml index 69dad7735..41718ac8f 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,14 +71,6 @@ node: ericsson-build - project-type: freestyle - - 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 5f77e8a4d..3e8bf6926 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,23 +41,14 @@ - 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: - 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}' @@ -88,10 +77,6 @@ - job-template: name: 'octopus-verify-{stream}' - node: master - - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 10 @@ -135,20 +120,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 - artifactDaysToKeep: -1 - artifactNumToKeep: 5 - parameters: - project-parameter: project: '{project}' @@ -161,7 +136,6 @@ refspec: '' choosing-strategy: 'default' - triggers: - gerrit: trigger-on: @@ -179,7 +153,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..46a05230b 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 @@ -62,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/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..fb8a23de2 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,15 +37,8 @@ # stream: branch with - in place of / (eg. stable) # branch: branch (eg. stable) - project-type: freestyle 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}' @@ -76,8 +67,6 @@ - job-template: name: 'oscar-verify' - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 10 @@ -127,14 +116,6 @@ # # This job's purpose is to update all the JJB - project-type: freestyle - - 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 1c5810a03..224a81f88 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,14 +72,6 @@ node: opnfv-build - project-type: freestyle - - logrotate: - daysToKeep: 30 - numToKeep: 40 - artifactDaysToKeep: -1 - artifactNumToKeep: 5 - parameters: - project-parameter: project: '{project}' @@ -121,7 +111,6 @@ cd $WORKSPACE/ci ./build.sh - - job-template: name: 'ovsnfv-daily-{stream}' @@ -129,14 +118,6 @@ disabled: true - 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/parser/parser.yml b/jjb/parser/parser.yml index 22324c5fb..05addcb83 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 @@ -123,20 +114,10 @@ - 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 - artifactDaysToKeep: -1 - artifactNumToKeep: 5 - parameters: - project-parameter: project: '{project}' @@ -149,7 +130,6 @@ refspec: '' choosing-strategy: 'default' - triggers: - gerrit: trigger-on: diff --git a/jjb/pharos/pharos.yml b/jjb/pharos/pharos.yml index ab6705b14..f596d6a9b 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,40 +25,16 @@ # 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: - 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}' @@ -87,10 +63,6 @@ - job-template: name: 'pharos-verify-{stream}' - node: master - - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 10 @@ -134,20 +106,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 - artifactDaysToKeep: -1 - artifactNumToKeep: 5 - parameters: - project-parameter: project: '{project}' @@ -177,6 +139,25 @@ - shell: !include-raw ../opnfvdocs/docu-build.sh +- job-template: + name: 'pharos-maas-pilot-{stream}' + + 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..d47392c20 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,20 +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 - artifactDaysToKeep: -1 - artifactNumToKeep: 5 - parameters: - project-parameter: project: '{project}' @@ -149,7 +130,6 @@ refspec: '' choosing-strategy: 'default' - triggers: - gerrit: trigger-on: diff --git a/jjb/qtip/qtip.yml b/jjb/qtip/qtip.yml index 0b863f7c4..8abde902c 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,20 +46,12 @@ # stream: branch with - in place of / (eg. stable) # branch: branch (eg. stable) - project-type: freestyle 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}' - scm: - git-scm: credentials-id: '{ssh-credentials}' @@ -89,8 +76,6 @@ - job-template: name: 'qtip-verify' - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 10 @@ -140,14 +125,6 @@ # # This job's purpose is to update all the JJB - project-type: freestyle - - logrotate: - daysToKeep: 30 - numToKeep: 40 - artifactDaysToKeep: -1 - artifactNumToKeep: 5 - parameters: - project-parameter: project: '{project}' @@ -182,8 +159,6 @@ - job-template: name: 'qtip-dhrystone-serial-{pod}' - project-type: freestyle - disabled: false node: '{node}' @@ -226,9 +201,6 @@ - job-template: name: 'qtip-ssl-parallel-{pod}' - - project-type: freestyle - disabled: false node: '{node}' @@ -286,7 +258,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 +273,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..37714722d 100644 --- a/jjb/releng-defaults.yaml +++ b/jjb/releng-defaults.yaml @@ -3,13 +3,18 @@ - 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: - 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/releng-macros.yaml b/jjb/releng-macros.yaml index 3afe8482a..f9cb95209 100644 --- a/jjb/releng-macros.yaml +++ b/jjb/releng-macros.yaml @@ -152,73 +152,9 @@ builders: - shell: | #!/bin/bash -e - set -o pipefail export PATH=$PATH:/usr/local/bin/ - - [[ $GERRIT_CHANGE_NUMBER =~ .+ ]] - - _get_title_script=" - import os - from docutils import core, nodes - with open('index.rst', 'r') as file: - data = file.read() - doctree = core.publish_doctree(data, - settings_overrides={'report_level': 5, - 'halt_level': 5}) - if isinstance(doctree[0], nodes.title): - title = doctree[0] - else: - for c in doctree.children: - if isinstance(c, nodes.section): - title = c[0] - break - print title.astext()" - _git_sha1="$(git rev-parse HEAD)" - git clone ssh://gerrit.opnfv.org:29418/releng - [[ -d releng ]] - - find docs/ -name 'index.rst' -printf '%h\n' | while read dir - do - _name="${dir##*/}" - _build="$dir/build" - _output="docs/output/$_name" - - echo - echo "#################${dir//?/#}" - echo "Building DOCS in $dir" - echo "#################${dir//?/#}" - echo - - sed -i "s/_sha1_/$_git_sha1/g" "$dir/index.rst" - - if [[ ! -f "$dir/conf.py" ]] ; then - cp releng/docs/etc/conf.py "$dir/conf.py" - _title=$(cd $dir; python -c "$_get_title_script") - echo "latex_documents = [('index', '$_name.tex', \"$_title\", 'OPNFV', 'manual'),]" >> "$dir/conf.py" - fi - cp -f releng/docs/etc/opnfv-logo.png "$dir/opnfv-logo.png" - - mkdir -p "$_output" - - sphinx-build -b html -E "$dir" "$_output" - - # Note: PDF creation may fail in project doc builds. - # We allow this test to be marked as succeeded with - # failure in PDF creation, but leave message to fix it. - # Any failure has to be fixed before B release. - { - sphinx-build -b latex -E "$dir" "$_build" - make -C "$_build" LATEXOPTS='--interaction=nonstopmode' all-pdf - mv "$_build/$_name.pdf" "$_output" - } || { - _msg="Error: PDF creation for $dir has failed, please fix source rst file(s)." - echo - echo "$_msg" - echo - echo "$_msg" >> gerrit_comment.txt - } - done + GERRIT_COMMENT=gerrit_comment.txt ./releng/utils/docs-build.sh - builder: name: upload-under-review-docs-to-opnfv-artifacts @@ -229,7 +165,7 @@ export PATH=$PATH:/usr/local/bin/ [[ $GERRIT_CHANGE_NUMBER =~ .+ ]] - [[ -d docs/output ]] + [[ -d output ]] echo echo "###########################" @@ -239,9 +175,10 @@ gs_base="artifacts.opnfv.org/review" gs_path="$gs_base/$GERRIT_CHANGE_NUMBER" - local_path="docs/$GERRIT_CHANGE_NUMBER" + local_path="upload/$GERRIT_CHANGE_NUMBER" - mv docs/output "$local_path" + mkdir -p upload + mv output "$local_path" gsutil -m cp -r "$local_path" "gs://$gs_base" if gsutil ls "gs://$gs_path" | grep -e 'html$' > /dev/null 2>&1 ; then @@ -263,7 +200,7 @@ set -o pipefail export PATH=$PATH:/usr/local/bin/ - [[ -d docs/output ]] + [[ -d output ]] echo echo "#####################" @@ -277,9 +214,10 @@ gs_base="artifacts.opnfv.org/$GERRIT_PROJECT/$GERRIT_BRANCH" fi gs_path="$gs_base/docs" - local_path="docs/docs" + local_path="upload/docs" - mv docs/output "$local_path" + mkdir -p upload + mv output "$local_path" gsutil -m cp -r "$local_path" "gs://$gs_base" if gsutil ls "gs://$gs_path" | grep -e 'html$' > /dev/null 2>&1 ; then diff --git a/jjb/storperf/storperf.yml b/jjb/storperf/storperf.yml index 2a3c42a6b..1b2d4060c 100644 --- a/jjb/storperf/storperf.yml +++ b/jjb/storperf/storperf.yml @@ -16,9 +16,7 @@ - job-template: name: 'storperf-verify-{stream}' - node: intel-jp-build-1 - - project-type: freestyle + node: opnfv-build logrotate: daysToKeep: 30 @@ -65,7 +63,6 @@ - shell: | $WORKSPACE/ci/verify.sh - - job-template: name: 'storperf-merge-{stream}' @@ -73,15 +70,7 @@ # # This job's purpose is to update all the JJB - node: intel-jp-build-1 - - project-type: freestyle - - logrotate: - daysToKeep: 30 - numToKeep: 40 - artifactDaysToKeep: -1 - artifactNumToKeep: 5 + node: opnfv-build parameters: - project-parameter: @@ -120,7 +109,6 @@ - junit: results: nosetests.xml - - job-template: name: 'storperf-daily-{stream}' @@ -129,18 +117,10 @@ # Required Variables: # stream: branch with - in place of / (eg. stable) # branch: branch (eg. stable) - node: intel-jp-build-1 + node: opnfv-build disabled: true - 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/vnf_forwarding_graph/vnf_forwarding_graph.yml b/jjb/vnf_forwarding_graph/vnf_forwarding_graph.yml index 0d7e8b7e2..1083c3c52 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,15 +37,8 @@ # stream: branch with - in place of / (eg. stable) # branch: branch (eg. stable) - project-type: freestyle 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}' @@ -76,8 +67,6 @@ - job-template: name: 'vnf_forwarding_graph-verify' - project-type: freestyle - logrotate: daysToKeep: 30 numToKeep: 10 @@ -127,14 +116,6 @@ # # This job's purpose is to update all the JJB - project-type: freestyle - - logrotate: - daysToKeep: 30 - numToKeep: 40 - artifactDaysToKeep: -1 - artifactNumToKeep: 5 - parameters: - project-parameter: project: '{project}' @@ -166,8 +147,3 @@ find . echo "merge logic goes here" - - - - - diff --git a/jjb/vswitchperf/vswitchperf.yml b/jjb/vswitchperf/vswitchperf.yml index 9f767ced3..9630cdbbc 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,16 +23,9 @@ # stream: branch with - in place of / (eg. stable) # branch: branch (eg. stable) - project-type: freestyle 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}' @@ -150,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 5afaaf723..25c16cee5 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,16 +95,8 @@ # # This job's purpose is to update all the JJB - project-type: freestyle - node: ericsson-build - logrotate: - daysToKeep: 30 - numToKeep: 40 - artifactDaysToKeep: -1 - artifactNumToKeep: 5 - parameters: - project-parameter: project: '{project}' @@ -154,8 +144,6 @@ - job-template: name: 'yardstick-{installer}-{pod}-{stream}' - project-type: freestyle - disabled: false node: '{node}' |