diff options
Diffstat (limited to 'jjb')
| -rwxr-xr-x | jjb/3rd_party_ci/create-apex-vms.sh | 10 | ||||
| -rwxr-xr-x | jjb/3rd_party_ci/download-netvirt-artifact.sh | 11 | ||||
| -rwxr-xr-x | jjb/3rd_party_ci/install-netvirt.sh | 8 | ||||
| -rw-r--r-- | jjb/3rd_party_ci/odl-netvirt.yml | 20 | ||||
| -rwxr-xr-x | jjb/3rd_party_ci/postprocess-netvirt.sh | 10 | ||||
| -rw-r--r-- | jjb/apex/apex-snapshot-deploy.sh | 3 | ||||
| -rw-r--r-- | jjb/apex/apex.yml | 1 | ||||
| -rw-r--r-- | jjb/daisy4nfv/daisy4nfv-merge-jobs.yml | 14 |
8 files changed, 38 insertions, 39 deletions
diff --git a/jjb/3rd_party_ci/create-apex-vms.sh b/jjb/3rd_party_ci/create-apex-vms.sh index 3f5dbd1c4..0744ac89a 100755 --- a/jjb/3rd_party_ci/create-apex-vms.sh +++ b/jjb/3rd_party_ci/create-apex-vms.sh @@ -1,12 +1,8 @@ #!/bin/bash -set -e +set -o errexit +set -o nounset +set -o pipefail -if [ -z ${WORKSPACE} ]; then - echo "WORKSPACE is unset. Please do so." - exit 1 -fi -# wipe the WORKSPACE -/bin/rm -rf $WORKSPACE/* # clone opnfv sdnvpn repo git clone https://gerrit.opnfv.org/gerrit/p/sdnvpn.git $WORKSPACE/sdnvpn diff --git a/jjb/3rd_party_ci/download-netvirt-artifact.sh b/jjb/3rd_party_ci/download-netvirt-artifact.sh index be2d4059a..fe8066cb8 100755 --- a/jjb/3rd_party_ci/download-netvirt-artifact.sh +++ b/jjb/3rd_party_ci/download-netvirt-artifact.sh @@ -1,12 +1,7 @@ #!/bin/bash -set -e - -if [ -z ${WORKSPACE} ]; then - echo "WORKSPACE is unset. Please do so." - exit 1 -fi -# wipe the WORKSPACE -/bin/rm -rf $WORKSPACE/* +set -o errexit +set -o nounset +set -o pipefail echo "Attempting to fetch the artifact location from ODL Jenkins" CHANGE_DETAILS_URL="https://git.opendaylight.org/gerrit/changes/netvirt~master~$GERRIT_CHANGE_ID/detail" diff --git a/jjb/3rd_party_ci/install-netvirt.sh b/jjb/3rd_party_ci/install-netvirt.sh index c9aa4c501..ce2a50cd0 100755 --- a/jjb/3rd_party_ci/install-netvirt.sh +++ b/jjb/3rd_party_ci/install-netvirt.sh @@ -1,12 +1,4 @@ #!/bin/bash -set -e - -if [ -z ${WORKSPACE} ]; then - echo "WORKSPACE is unset. Please set." - exit 1 -fi -# wipe the WORKSPACE -/bin/rm -rf $WORKSPACE/* set -o errexit set -o nounset set -o pipefail diff --git a/jjb/3rd_party_ci/odl-netvirt.yml b/jjb/3rd_party_ci/odl-netvirt.yml index 6e25425ba..f3a4c0236 100644 --- a/jjb/3rd_party_ci/odl-netvirt.yml +++ b/jjb/3rd_party_ci/odl-netvirt.yml @@ -48,6 +48,14 @@ max-per-node: 1 option: 'project' + scm: + - git: + url: https://gerrit.opnfv.org/gerrit/apex + branches: + - 'origin/master' + timeout: 15 + wipe-workspace: true + parameters: - project-parameter: project: '{project}' @@ -171,6 +179,14 @@ timeout: 360 fail: true + scm: + - git: + url: https://gerrit.opnfv.org/gerrit/apex + branches: + - 'origin/master' + timeout: 15 + wipe-workspace: true + parameters: - project-parameter: project: '{project}' @@ -181,6 +197,10 @@ name: DEPLOY_SCENARIO default: 'os-odl_l2-bgpvpn-noha' description: 'Scenario to deploy and test' + - string: + name: GS_URL + default: artifacts.opnfv.org/apex + description: "URL to Google Storage with snapshot artifacts." builders: - description-setter: diff --git a/jjb/3rd_party_ci/postprocess-netvirt.sh b/jjb/3rd_party_ci/postprocess-netvirt.sh index 5baf378a9..796514259 100755 --- a/jjb/3rd_party_ci/postprocess-netvirt.sh +++ b/jjb/3rd_party_ci/postprocess-netvirt.sh @@ -1,12 +1,8 @@ #!/bin/bash -set -e +set -o errexit +set -o nounset +set -o pipefail -if [ -z ${WORKSPACE} ]; then - echo "WORKSPACE is unset. Please do so." - exit 1 -fi -# wipe the WORKSPACE -/bin/rm -rf $WORKSPACE/* # clone opnfv sdnvpn repo git clone https://gerrit.opnfv.org/gerrit/p/sdnvpn.git $WORKSPACE/sdnvpn . $WORKSPACE/sdnvpn/odl-pipeline/odl-pipeline-common.sh diff --git a/jjb/apex/apex-snapshot-deploy.sh b/jjb/apex/apex-snapshot-deploy.sh index 3bb65a0b3..a99955f9a 100644 --- a/jjb/apex/apex-snapshot-deploy.sh +++ b/jjb/apex/apex-snapshot-deploy.sh @@ -21,8 +21,7 @@ echo "--------------------------" echo echo "Cleaning server" -git clone https://gerrit.opnfv.org/gerrit/apex.git -pushd apex/ci > /dev/null +pushd ci > /dev/null sudo CONFIG=../build/ LIB=../lib ./clean.sh popd > /dev/null diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml index 07da97a53..e3f0f53bc 100644 --- a/jjb/apex/apex.yml +++ b/jjb/apex/apex.yml @@ -275,6 +275,7 @@ predefined-parameters: | BUILD_DIRECTORY=apex-verify-gate-{stream} OPNFV_CLEAN=yes + current-parameters: true git-revision: false block: true same-node: true diff --git a/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml b/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml index 11cdc1bf3..a6659b2bf 100644 --- a/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml +++ b/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml @@ -179,23 +179,23 @@ name: 'daisy-merge-build-macro' builders: - shell: - !include-raw-escape: ./daisy4nfv-basic.sh + !include-raw: ./daisy4nfv-basic.sh - shell: - !include-raw-escape: ./daisy4nfv-build.sh + !include-raw: ./daisy4nfv-build.sh - shell: - !include-raw-escape: ./daisy4nfv-upload-artifact.sh + !include-raw: ./daisy4nfv-upload-artifact.sh - shell: - !include-raw-escape: ./daisy4nfv-workspace-cleanup.sh + !include-raw: ./daisy4nfv-workspace-cleanup.sh - builder: name: 'daisy-merge-deploy-virtual-macro' builders: - shell: - !include-raw-escape: ./daisy4nfv-download-artifact.sh + !include-raw: ./daisy4nfv-download-artifact.sh - shell: - !include-raw-escape: ./daisy4nfv-virtual-deploy.sh + !include-raw: ./daisy4nfv-virtual-deploy.sh - shell: - !include-raw-escape: ./daisy4nfv-workspace-cleanup.sh + !include-raw: ./daisy4nfv-workspace-cleanup.sh ##################################### # parameter macros |