diff options
| -rw-r--r-- | jjb/apex/apex.yml | 3 | ||||
| -rwxr-xr-x | jjb/armband/armband-deploy.sh | 15 | ||||
| -rwxr-xr-x | jjb/daisy4nfv/daisy4nfv-virtual-deploy.sh | 4 | ||||
| -rw-r--r-- | jjb/doctor/doctor.yml | 50 |
4 files changed, 56 insertions, 16 deletions
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml index 8bfc53d59..7724577a0 100644 --- a/jjb/apex/apex.yml +++ b/jjb/apex/apex.yml @@ -59,6 +59,7 @@ - 'os-odl_l2-nofeature-ha' - 'os-odl_l2-bgpvpn-ha' - 'os-odl_l2-fdio-noha' + - 'os-odl_l2-fdio-ha' - 'os-odl_l2-sfc-noha' - 'os-odl_l3-nofeature-ha' - 'os-onos-nofeature-ha' @@ -744,7 +745,7 @@ failure-threshold: 'never' unstable-threshold: 'FAILURE' - trigger-builds: - - project: 'apex-deploy-baremetal-os-odl_l2-fdio-noha-{stream}' + - project: 'apex-deploy-baremetal-os-odl_l2-fdio-ha-{stream}' predefined-parameters: | BUILD_DIRECTORY=apex-build-{stream}/build OPNFV_CLEAN=yes diff --git a/jjb/armband/armband-deploy.sh b/jjb/armband/armband-deploy.sh index e0631c424..4df9acfd8 100755 --- a/jjb/armband/armband-deploy.sh +++ b/jjb/armband/armband-deploy.sh @@ -71,10 +71,23 @@ ISO_FILE=$WORKSPACE/opnfv.iso # log file name FUEL_LOG_FILENAME="${JOB_NAME}_${BUILD_NUMBER}.log.tar.gz" +# Deploy Cache (to enable just create the deploy-cache subdir) +# NOTE: Only available when ISO files are cached using ISOSTORE mechanism +DEPLOY_CACHE=${ISOSTORE:-/iso_mount/opnfv_ci}/${GIT_BRANCH##*/}/deploy-cache +if [[ -d "${DEPLOY_CACHE}" ]]; then + echo "Deploy cache dir present." + echo "--------------------------------------------------------" + echo "Fuel@OPNFV deploy cache: ${DEPLOY_CACHE}" + DEPLOY_CACHE="-C ${DEPLOY_CACHE}" +else + DEPLOY_CACHE="" +fi + # construct the command DEPLOY_COMMAND="$WORKSPACE/ci/deploy.sh -b ${LAB_CONFIG_URL} \ -l $LAB_NAME -p $POD_NAME -s $DEPLOY_SCENARIO -i file://${ISO_FILE} \ - -H -B ${DEFAULT_BRIDGE:-pxebr} -S $TMPDIR -L $WORKSPACE/$FUEL_LOG_FILENAME" + -H -B ${DEFAULT_BRIDGE:-pxebr} -S $TMPDIR -L $WORKSPACE/$FUEL_LOG_FILENAME \ + ${DEPLOY_CACHE}" # log info to console echo "Deployment parameters" diff --git a/jjb/daisy4nfv/daisy4nfv-virtual-deploy.sh b/jjb/daisy4nfv/daisy4nfv-virtual-deploy.sh index 9de494fc2..4aa7b0bd5 100755 --- a/jjb/daisy4nfv/daisy4nfv-virtual-deploy.sh +++ b/jjb/daisy4nfv/daisy4nfv-virtual-deploy.sh @@ -10,7 +10,9 @@ if [[ "$NODE_NAME" =~ "-virtual" ]]; then export NETWORK_CONF=./deploy/config/vm_environment/$NODE_NAME/network.yml export DHA_CONF=./deploy/config/vm_environment/$NODE_NAME/deploy.yml else - exit 1 + # TODO: For the time being, we need to pass this script to let contributors merge their work. + echo "No support for non-virtual node" + exit 0 fi ./ci/deploy/deploy.sh ${DHA_CONF} ${NETWORK_CONF} diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml index 5bf34aca5..9a74f4e3d 100644 --- a/jjb/doctor/doctor.yml +++ b/jjb/doctor/doctor.yml @@ -85,21 +85,44 @@ name: OS_CREDS default: /home/jenkins/openstack.creds description: 'OpenStack credentials' - - '{installer}-defaults' - '{slave-label}-defaults' - - functest-suite-parameter: - FUNCTEST_SUITE_NAME: 'doctor' - TESTCASE_OPTIONS: '-e INSPECTOR_TYPE={inspector} -v $WORKSPACE:$HOME/opnfv/repos/doctor' - string: - name: DEPLOY_SCENARIO - default: 'os-nosdn-nofeature-ha' + name: INSTALLER_TYPE + default: '{installer}' + description: 'Installer used for deploying OPNFV on this POD' - string: name: DOCKER_TAG default: '{docker-tag}' description: 'Tag to pull docker image' - - functest-parameter: - gs-pathname: '{gs-pathname}' - CI_DEBUG: 'true' + - string: + name: DEPLOY_SCENARIO + default: 'os-nosdn-nofeature-ha' + description: 'Scenario to deploy and test' + # functest-suite-parameter + - string: + name: FUNCTEST_SUITE_NAME + default: '{project}' + - string: + name: TESTCASE_OPTIONS + default: '-e INSPECTOR_TYPE={inspector} -v $WORKSPACE:/home/opnfv/repos/doctor' + description: 'Addtional parameters specific to test case(s)' + # functest-parameter + - string: + name: GS_PATHNAME + default: '{gs-pathname}' + description: "Version directory where the opnfv documents will be stored in gs repository" + - string: + name: FUNCTEST_REPO_DIR + default: "/home/opnfv/repos/functest" + description: "Directory where the Functest repository is cloned" + - string: + name: PUSH_RESULTS_TO_DB + default: "true" + description: "Push the results of all the tests to the resultDB" + - string: + name: CI_DEBUG + default: 'true' + description: "Show debug output information" scm: - gerrit-trigger-scm: @@ -135,8 +158,6 @@ notbuilt: true builders: - - description-setter: - description: "POD: $NODE_NAME" - 'functest-suite-builder' publishers: @@ -144,11 +165,14 @@ builders: - functest-copy-suite-log: suite: '{project}' + stream: '{stream}' + script-only-if-succeeded: False + script-only-if-failed: False - archive: - artifacts: '{project}.log' + artifacts: '*.log' - builder: name: functest-copy-suite-log builders: - shell: | - cp $HOME/opnfv/functest/results/${{GIT_BRANCH##*/}}/{suite}.log $WORKSPACE/ + cp $HOME/opnfv/functest/results/{stream}/{suite}.log $WORKSPACE/ |