diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/3rd_party_ci/odl-netvirt.yml | 3 | ||||
| -rwxr-xr-x | jjb/3rd_party_ci/postprocess-netvirt.sh | 11 | ||||
| -rw-r--r-- | jjb/apex/apex.yml | 161 | ||||
| -rw-r--r-- | jjb/dovetail/dovetail-ci-jobs.yml | 8 | ||||
| -rwxr-xr-x | jjb/functest/functest-cleanup.sh | 2 | ||||
| -rw-r--r-- | jjb/global/installer-params.yml | 4 | ||||
| -rw-r--r-- | jjb/kvmfornfv/kvmfornfv.yml | 28 |
7 files changed, 203 insertions, 14 deletions
diff --git a/jjb/3rd_party_ci/odl-netvirt.yml b/jjb/3rd_party_ci/odl-netvirt.yml index 4a65dcbb7..ca1936156 100644 --- a/jjb/3rd_party_ci/odl-netvirt.yml +++ b/jjb/3rd_party_ci/odl-netvirt.yml @@ -3,7 +3,7 @@ project: 'netvirt' - installer: 'apex' + installer: 'netvirt' ##################################### # branch definitions ##################################### @@ -123,6 +123,7 @@ predefined-parameters: | FUNCTEST_SUITE_NAME=vping_userdata,bgpvpn RC_FILE_PATH=/home/jenkins/cloner-info/overcloudrc + DEPLOY_SCENARIO=os-odl_l2-bgpvpn-noha node-parameters: true kill-phase-on: FAILURE abort-all-job: false diff --git a/jjb/3rd_party_ci/postprocess-netvirt.sh b/jjb/3rd_party_ci/postprocess-netvirt.sh index adffaf42d..2e99477c5 100755 --- a/jjb/3rd_party_ci/postprocess-netvirt.sh +++ b/jjb/3rd_party_ci/postprocess-netvirt.sh @@ -2,6 +2,13 @@ set -e # wipe the WORKSPACE +if [ -z ${WORKSPACE} ]; then echo "WORKSPACE is unset"; else echo "WORKSPACE is set to \"$WORKSPACE\""; fi +WORKSPACE=${WORKSPACE:-$PWD} /bin/rm -rf $WORKSPACE/* - -echo "Hello World" +set -e +# clone opnfv sdnvpn repo +git clone https://gerrit.opnfv.org/gerrit/p/sdnvpn.git $WORKSPACE/sdnvpn +. $WORKSPACE/sdnvpn/odl-pipeline/odl-pipeline-common.sh +pushd $LIB +./post_process.sh +popd
\ No newline at end of file diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml index 20a7dbcdd..70731b568 100644 --- a/jjb/apex/apex.yml +++ b/jjb/apex/apex.yml @@ -9,6 +9,9 @@ - 'apex-deploy-virtual-{scenario}-{stream}' - 'apex-deploy-baremetal-{scenario}-{stream}' - 'apex-daily-{stream}' + - 'apex-daily-colorado' + - 'apex-build-colorado' + - 'apex-deploy-baremetal-os-odl_l2-fdio-ha-colorado' # stream: branch with - in place of / (eg. stable-arno) # branch: branch (eg. stable/arno) @@ -548,6 +551,160 @@ failure-threshold: 'never' unstable-threshold: 'FAILURE' + +# Colorado Build +- job-template: + name: 'apex-build-colorado' + + # Job template for builds + # + # Required Variables: + # stream: branch with - in place of / (eg. stable) + # branch: branch (eg. stable) + node: 'apex-daily-colorado' + + disabled: false + + concurrent: true + + parameters: + - project-parameter: + project: '{project}' + - apex-parameter: + gs-pathname: '/colorado' + - gerrit-parameter: + branch: 'stable/colorado' + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: "Used for overriding the GIT URL coming from parameters macro." + + scm: + - git-scm + + properties: + - build-blocker: + use-build-blocker: true + block-level: 'NODE' + blocking-jobs: + - 'apex-deploy.*' + - throttle: + max-per-node: 1 + max-total: 10 + option: 'project' + + builders: + - 'apex-build' + - 'apex-upload-artifact' + + +# Colorado FDIO Deploy +- job-template: + name: 'apex-deploy-baremetal-os-odl_l2-fdio-ha-colorado' + + # Job template for baremetal deployment + # + # Required Variables: + # stream: branch with - in place of / (eg. stable) + # branch: branch (eg. stable) + node: 'lf-pod1' + + disabled: false + + scm: + - git-scm + + parameters: + - project-parameter: + project: '{project}' + - gerrit-parameter: + branch: 'stable/colorado' + - apex-parameter: + gs-pathname: '/colorado' + - string: + name: DEPLOY_SCENARIO + default: 'os-odl_l2-fdio-ha' + description: "Scenario to deploy with." + + properties: + - build-blocker: + use-build-blocker: true + block-level: 'NODE' + blocking-jobs: + - 'apex-verify.*' + - 'apex-deploy.*' + - 'apex-build.*' + + + builders: + - 'apex-deploy' + - 'apex-workspace-cleanup' + +# Colorado FDIO Daily +- job-template: + name: 'apex-daily-colorado' + + # Job template for daily build + # + # Required Variables: + # stream: branch with - in place of / (eg. stable) + # branch: branch (eg. stable) + node: 'apex-daily-colorado' + + disabled: false + + scm: + - git-scm + + parameters: + - project-parameter: + project: '{project}' + - gerrit-parameter: + branch: 'stable/colorado' + - apex-parameter: + gs-pathname: '/colorado' + + properties: + - build-blocker: + use-build-blocker: true + block-level: 'NODE' + blocking-jobs: + - 'apex-verify.*' + - 'apex-deploy.*' + - 'apex-build.*' + - 'apex-runner.*' + + triggers: + - 'apex-colorado' + + builders: + - trigger-builds: + - project: 'apex-build-colorado' + git-revision: true + current-parameters: true + same-node: true + block: true + - trigger-builds: + - project: 'apex-deploy-baremetal-os-odl_l2-fdio-ha-colorado' + predefined-parameters: | + BUILD_DIRECTORY=apex-build-colorado/.build + OPNFV_CLEAN=yes + git-revision: true + same-node: true + block-thresholds: + build-step-failure-threshold: 'never' + block: true + - trigger-builds: + - project: 'functest-apex-apex-daily-colorado-daily-colorado' + predefined-parameters: + DEPLOY_SCENARIO=os-odl_l2-fdio-ha + block: true + same-node: true + block-thresholds: + build-step-failure-threshold: 'never' + failure-threshold: 'never' + unstable-threshold: 'FAILURE' + - job-template: name: 'apex-gs-clean-{stream}' @@ -655,6 +812,10 @@ triggers: - timed: '0 3 * * *' - trigger: + name: 'apex-colorado' + triggers: + - timed: '0 12 * * *' +- trigger: name: 'apex-gs-clean-{stream}' triggers: - timed: '0 2 * * *' diff --git a/jjb/dovetail/dovetail-ci-jobs.yml b/jjb/dovetail/dovetail-ci-jobs.yml index f41325020..2b6ab7621 100644 --- a/jjb/dovetail/dovetail-ci-jobs.yml +++ b/jjb/dovetail/dovetail-ci-jobs.yml @@ -103,22 +103,22 @@ auto-trigger-name: 'daily-trigger-disabled' <<: *colorado #armband CI PODs - - armband_baremetal: + - armband-baremetal: slave-label: armband-baremetal SUT: fuel auto-trigger-name: 'daily-trigger-disabled' <<: *master - - armband_virtual: + - armband-virtual: slave-label: armband-virtual SUT: fuel auto-trigger-name: 'daily-trigger-disabled' <<: *master - - armband_baremetal: + - armband-baremetal: slave-label: armband-baremetal SUT: fuel auto-trigger-name: 'daily-trigger-disabled' <<: *colorado - - armband_virtual: + - armband-virtual: slave-label: armband-virtual SUT: fuel auto-trigger-name: 'daily-trigger-disabled' diff --git a/jjb/functest/functest-cleanup.sh b/jjb/functest/functest-cleanup.sh index 3c4c7f965..a1ae67d99 100755 --- a/jjb/functest/functest-cleanup.sh +++ b/jjb/functest/functest-cleanup.sh @@ -10,7 +10,7 @@ if [[ ! -z $(docker ps -a | grep opnfv/functest) ]]; then fi # Remove existing images if exist -if [[ $CLEAN_DOCKER_IMAGES ]] && [[ ! -z $(docker images | grep opnfv/functest) ]]; then +if [[ $CLEAN_DOCKER_IMAGES == true ]] && [[ ! -z $(docker images | grep opnfv/functest) ]]; then echo "Docker images to remove:" docker images | head -1 && docker images | grep opnfv/functest >${redirect} image_tags=($(docker images | grep opnfv/functest | awk '{print $2}')) diff --git a/jjb/global/installer-params.yml b/jjb/global/installer-params.yml index 610072d1b..4a50a5906 100644 --- a/jjb/global/installer-params.yml +++ b/jjb/global/installer-params.yml @@ -109,11 +109,11 @@ description: 'IP of the installer' - string: name: INSTALLER_TYPE - default: apex + default: netvirt description: 'Installer used for deploying OPNFV on this POD' - string: name: DEPLOY_SCENARIO - default: 'none' + default: 'os-odl_l2-bgpvpn-noha' description: 'Scenario to deploy and test' - string: name: EXTERNAL_NETWORK diff --git a/jjb/kvmfornfv/kvmfornfv.yml b/jjb/kvmfornfv/kvmfornfv.yml index a708c8af2..33c73f9a7 100644 --- a/jjb/kvmfornfv/kvmfornfv.yml +++ b/jjb/kvmfornfv/kvmfornfv.yml @@ -201,20 +201,40 @@ - description-setter: description: "Built on $NODE_NAME" - multijob: - name: build + name: cyclictest-build condition: SUCCESSFUL projects: - - name: 'kvmfornfv-{testname}-daily-build-{stream}' + - name: 'kvmfornfv-cyclictest-daily-build-{stream}' current-parameters: false node-parameters: false git-revision: true kill-phase-on: FAILURE abort-all-job: true - multijob: - name: build + name: cyclictest-test + condition: SUCCESSFUL + projects: + - name: 'kvmfornfv-cyclictest-daily-test-{stream}' + current-parameters: false + node-parameters: false + git-revision: true + kill-phase-on: FAILURE + abort-all-job: true + - multijob: + name: packetforward-build + condition: SUCCESSFUL + projects: + - name: 'kvmfornfv-packet_forward-daily-build-{stream}' + current-parameters: false + node-parameters: false + git-revision: true + kill-phase-on: FAILURE + abort-all-job: true + - multijob: + name: packetforward-test condition: SUCCESSFUL projects: - - name: 'kvmfornfv-{testname}-daily-test-{stream}' + - name: 'kvmfornfv-packet_forward-daily-test-{stream}' current-parameters: false node-parameters: false git-revision: true |