diff options
| author |   Fatih Degirmenci <fdegir@gmail.com> | 2018-02-12 07:49:18 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-02-12 07:49:18 +0000 |
| commit | 37980c29656ff34ae0fa8b0bf14ad876382778b3 (patch) | |
| tree | 6e561b66282949535213735b859fd621fc975550 | |
| parent | 30eb16fb6d7f16bc05258298eeef78732bdd9cf0 (diff) | |
| parent | 9dc51f765444a912266e5f5ea86a8a25c18d0dda (diff) | |
Merge changes I68779792,Ide8d210e
* changes:
Export CI_LOOP as expected by Functest
Export an new var related to Energy in functest jobs
| -rwxr-xr-x | jjb/functest/functest-alpine.sh | 6 |
1 files changed, 4 insertions, 2 deletions
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" |