diff options
| -rwxr-xr-x | jjb/dovetail/dovetail-run.sh | 4 | ||||
| -rwxr-xr-x | jjb/functest/functest-alpine.sh | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/jjb/dovetail/dovetail-run.sh b/jjb/dovetail/dovetail-run.sh index de92c1814..451662abe 100755 --- a/jjb/dovetail/dovetail-run.sh +++ b/jjb/dovetail/dovetail-run.sh @@ -274,9 +274,9 @@ echo "exec command: ${cp_tempest_cmd}" $cp_tempest_cmd if [[ ${TESTSUITE} == 'default' ]]; then - testsuite= '' + testsuite='' else - testsuite= "--testsuite ${TESTSUITE}" + testsuite="--testsuite ${TESTSUITE}" fi run_cmd="dovetail run ${testsuite} -d" diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh index e7171f035..432bbbb8b 100755 --- a/jjb/functest/functest-alpine.sh +++ b/jjb/functest/functest-alpine.sh @@ -4,7 +4,9 @@ set -e set +u set +o pipefail +CI_LOOP=${CI_LOOP:-daily} TEST_DB_URL=http://testresults.opnfv.org/test/api/v1/results +ENERGY_RECORDER_API_URL=http://energy.opnfv.fr/resources check_os_deployment() { FUNCTEST_IMAGE=opnfv/functest-healthcheck:${DOCKER_TAG} @@ -147,8 +149,8 @@ test -f ${HOME}/opnfv/functest/custom/params_${DOCKER_TAG} && custom_params=$(ca envs="-e INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} \ -e NODE_NAME=${NODE_NAME} -e DEPLOY_SCENARIO=${DEPLOY_SCENARIO} \ - -e BUILD_TAG=${BUILD_TAG} -e DEPLOY_TYPE=${DEPLOY_TYPE} \ - -e TEST_DB_URL=${TEST_DB_URL}" + -e BUILD_TAG=${BUILD_TAG} -e DEPLOY_TYPE=${DEPLOY_TYPE} -e CI_LOOP=${CI_LOOP} \ + -e TEST_DB_URL=${TEST_DB_URL} -e ENERGY_RECORDER_API_URL=${ENERGY_RECORDER_API_URL}" ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" |