diff options
Diffstat (limited to 'jjb')
| -rwxr-xr-x | jjb/3rd_party_ci/create-apex-vms.sh | 14 | ||||
| -rwxr-xr-x | jjb/3rd_party_ci/download-netvirt-artifact.sh | 12 | ||||
| -rwxr-xr-x | jjb/3rd_party_ci/functest-netvirt.sh | 5 | ||||
| -rwxr-xr-x | jjb/3rd_party_ci/install-netvirt.sh | 12 | ||||
| -rw-r--r-- | jjb/3rd_party_ci/odl-netvirt.yml | 39 | ||||
| -rwxr-xr-x | jjb/3rd_party_ci/postprocess-netvirt.sh | 5 | ||||
| -rwxr-xr-x | jjb/dovetail/dovetail-run.sh | 2 | ||||
| -rwxr-xr-x | jjb/functest/functest-suite.sh | 2 | ||||
| -rw-r--r-- | jjb/global/slave-params.yml | 8 |
9 files changed, 49 insertions, 50 deletions
diff --git a/jjb/3rd_party_ci/create-apex-vms.sh b/jjb/3rd_party_ci/create-apex-vms.sh index cb742712b..a076dd084 100755 --- a/jjb/3rd_party_ci/create-apex-vms.sh +++ b/jjb/3rd_party_ci/create-apex-vms.sh @@ -1,8 +1,12 @@ #!/bin/bash +set -e -# clone opnfv sdnvpn repo -git clone https://gerrit.opnfv.org/gerrit/p/sdnvpn.git -cd sdnvpn -ls -al +# wipe the WORKSPACE +/bin/rm -rf $WORKSPACE/* -# here is where the script(s) to bring up apex vms should be executed +# 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 +./test_environment.sh --env-number $APEX_ENV_NUMBER --cloner-info $CLONER_INFO --snapshot-disks $SNAPSHOT_DISKS --vjump-hosts $VIRTUAL_JUMPHOSTS +popd diff --git a/jjb/3rd_party_ci/download-netvirt-artifact.sh b/jjb/3rd_party_ci/download-netvirt-artifact.sh index d0b9a05d7..0a48e3aec 100755 --- a/jjb/3rd_party_ci/download-netvirt-artifact.sh +++ b/jjb/3rd_party_ci/download-netvirt-artifact.sh @@ -1,4 +1,8 @@ #!/bin/bash +set -e + +# wipe the WORKSPACE +/bin/rm -rf $WORKSPACE/* 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" @@ -7,7 +11,13 @@ ODL_JOB_URL=$(curl -s $CHANGE_DETAILS_URL | grep netvirt-patch-test-current-carb sed 's/\\n//g' | awk '{print $6}') NETVIRT_ARTIFACT_URL="${ODL_JOB_URL}org.opendaylight.integration\$distribution-karaf/artifact/org.opendaylight.integration/distribution-karaf/0.6.0-SNAPSHOT/distribution-karaf-0.6.0-SNAPSHOT.tar.gz" echo -e "URL to artifact is\n\t$NETVIRT_ARTIFACT_URL" + echo "Downloading the artifact. This could take time..." -curl -s -o $NETVIRT_ARTIFACT $NETVIRT_ARTIFACT_URL +wget -q -O $NETVIRT_ARTIFACT $NETVIRT_ARTIFACT_URL +if [[ $? -ne 0 ]]; then + echo "The artifact does not exist! Probably removed due to ODL Jenkins artifact retention policy." + echo "Rerun netvirt-patch-test-current-carbon to get artifact rebuilt." + exit 1 +fi echo "Download complete" ls -al $NETVIRT_ARTIFACT diff --git a/jjb/3rd_party_ci/functest-netvirt.sh b/jjb/3rd_party_ci/functest-netvirt.sh index abc7975ce..adffaf42d 100755 --- a/jjb/3rd_party_ci/functest-netvirt.sh +++ b/jjb/3rd_party_ci/functest-netvirt.sh @@ -1,4 +1,7 @@ #!/bin/bash +set -e + +# wipe the WORKSPACE +/bin/rm -rf $WORKSPACE/* echo "Hello World" -ls -al $WORKSPACE diff --git a/jjb/3rd_party_ci/install-netvirt.sh b/jjb/3rd_party_ci/install-netvirt.sh index 041d8517e..96c4b9634 100755 --- a/jjb/3rd_party_ci/install-netvirt.sh +++ b/jjb/3rd_party_ci/install-netvirt.sh @@ -1,8 +1,8 @@ #!/bin/bash - +set -e # clone opnfv sdnvpn repo -git clone https://gerrit.opnfv.org/gerrit/p/sdnvpn.git -cd sdnvpn -ls -al - -# here is where the script(s) to install netvirt should be executed +git clone https://gerrit.opnfv.org/gerrit/p/sdnvpn.git $WORKSPACE/sdnvpn +. $WORKSPACE/sdnvpn/odl-pipeline/odl-pipeline-common.sh +pushd $LIB +./odl_reinstaller.sh --cloner-info $CLONER_INFO --odl-artifact $NETVIRT_ARTIFACT +popd
\ No newline at end of file diff --git a/jjb/3rd_party_ci/odl-netvirt.yml b/jjb/3rd_party_ci/odl-netvirt.yml index 54d1e4353..3dd4c0b44 100644 --- a/jjb/3rd_party_ci/odl-netvirt.yml +++ b/jjb/3rd_party_ci/odl-netvirt.yml @@ -19,11 +19,11 @@ - 'create-apex-vms': slave-label: 'ericsson-virtual5' - 'install-netvirt': - slave-label: 'ericsson-virtual6' + slave-label: 'odl-netvirt-virtual' - 'functest': - slave-label: 'ericsson-virtual6' + slave-label: 'odl-netvirt-virtual' - 'postprocess': - slave-label: 'ericsson-virtual6' + slave-label: 'odl-netvirt-virtual' ##################################### # jobs ##################################### @@ -56,14 +56,8 @@ branch: '{branch}' - string: name: NETVIRT_ARTIFACT - default: $WORKSPACE/distribution-karaf.tar.gz" - - 'ericsson-virtual6-defaults' - - scm: - - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' - refspec: '$GERRIT_REFSPEC' - choosing-strategy: 'gerrit' + default: $WORKSPACE/distribution-karaf.tar.gz + - 'odl-netvirt-virtual-defaults' triggers: - gerrit: @@ -100,6 +94,7 @@ GERRIT_PATCHSET_NUMBER=$GERRIT_PATCHSET_NUMBER GERRIT_PATCHSET_REVISION=$GERRIT_PATCHSET_REVISION NETVIRT_ARTIFACT=$NETVIRT_ARTIFACT + APEX_ENV_NUMBER=$APEX_ENV_NUMBER node-parameters: false kill-phase-on: FAILURE abort-all-job: true @@ -124,22 +119,16 @@ name: functest condition: SUCCESSFUL projects: - - name: 'odl-netvirt-verify-virtual-functest-{stream}' - current-parameters: false + - name: 'functest-netvirt-virtual-suite-{stream}' predefined-parameters: | - GERRIT_BRANCH=$GERRIT_BRANCH - GERRIT_REFSPEC=$GERRIT_REFSPEC - GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER - GERRIT_CHANGE_ID=$GERRIT_CHANGE_ID - GERRIT_PATCHSET_NUMBER=$GERRIT_PATCHSET_NUMBER - GERRIT_PATCHSET_REVISION=$GERRIT_PATCHSET_REVISION - NETVIRT_ARTIFACT=$NETVIRT_ARTIFACT + FUNCTEST_SUITE_NAME=vping_userdata,bgpvpn + RC_FILE_PATH=/home/jenkins/cloner-info/overcloudrc node-parameters: true kill-phase-on: FAILURE - abort-all-job: true + abort-all-job: false - multijob: name: postprocess - condition: SUCCESSFUL + condition: ALWAYS projects: - name: 'odl-netvirt-verify-virtual-postprocess-{stream}' current-parameters: false @@ -176,12 +165,6 @@ - 'odl-netvirt-verify-virtual-postprocess-.*' block-level: 'NODE' - scm: - - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' - refspec: '$GERRIT_REFSPEC' - choosing-strategy: 'gerrit' - wrappers: - ssh-agent-credentials: users: diff --git a/jjb/3rd_party_ci/postprocess-netvirt.sh b/jjb/3rd_party_ci/postprocess-netvirt.sh index abc7975ce..adffaf42d 100755 --- a/jjb/3rd_party_ci/postprocess-netvirt.sh +++ b/jjb/3rd_party_ci/postprocess-netvirt.sh @@ -1,4 +1,7 @@ #!/bin/bash +set -e + +# wipe the WORKSPACE +/bin/rm -rf $WORKSPACE/* echo "Hello World" -ls -al $WORKSPACE diff --git a/jjb/dovetail/dovetail-run.sh b/jjb/dovetail/dovetail-run.sh index a41a989fb..4082c34fe 100755 --- a/jjb/dovetail/dovetail-run.sh +++ b/jjb/dovetail/dovetail-run.sh @@ -66,7 +66,7 @@ if [ $(docker ps | grep "opnfv/dovetail:${DOCKER_TAG}" | wc -l) == 0 ]; then exit 1 fi -exec_cmd="python ${DOVETAIL_REPO_DIR}/dovetail/run.py --testsuite ${TESTSUITE}" +exec_cmd="python ${DOVETAIL_REPO_DIR}/dovetail/run.py --testsuite ${TESTSUITE} -d true" echo "Container exec command: ${exec_cmd}" docker exec ${container_id} ${exec_cmd} diff --git a/jjb/functest/functest-suite.sh b/jjb/functest/functest-suite.sh index df286569f..a30fb5973 100755 --- a/jjb/functest/functest-suite.sh +++ b/jjb/functest/functest-suite.sh @@ -8,7 +8,7 @@ if [[ ${branch} == *"brahmaputra"* ]]; then elif [[ ${branch} == *"colorado"* ]]; then cmd="python ${FUNCTEST_REPO_DIR}/ci/run_tests.py -t $FUNCTEST_SUITE_NAME" else - cmd="python ${FUNCTEST_REPO_DIR}/functest/ci/run_tests.py -t $FUNCTEST_SUITE_NAME" + cmd="functest testcase run $FUNCTEST_SUITE_NAME" fi container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1) docker exec $container_id $cmd diff --git a/jjb/global/slave-params.yml b/jjb/global/slave-params.yml index 96ad75c69..252611191 100644 --- a/jjb/global/slave-params.yml +++ b/jjb/global/slave-params.yml @@ -681,19 +681,15 @@ default: https://git.opendaylight.org/gerrit/p/$PROJECT.git description: 'Git URL to use on this Jenkins Slave' - parameter: - name: 'ericsson-virtual6-defaults' + name: 'odl-netvirt-virtual-defaults' parameters: - label: name: SLAVE_LABEL - default: 'ericsson-virtual6' + default: 'odl-netvirt-virtual' - string: name: GIT_BASE default: https://git.opendaylight.org/gerrit/p/$PROJECT.git description: 'Git URL to use on this Jenkins Slave' - - string: - name: APEX_ENV_NUMBER - default: 0 - description: 'The number of the Apex environment on the machine' ##################################################### # These slaves are just dummy slaves for sandbox jobs ##################################################### |