summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormei mei <meimei@huawei.com>2019-04-15 06:36:30 +0000
committerGerrit Code Review <gerrit@opnfv.org>2019-04-15 06:36:30 +0000
commit22c2f607bcaff65bee79149f775dcabcfcf1a396 (patch)
tree01e42dd032582ae554ad4f3debcc9beb0ad52a35
parent6cf4b53992d9b60ec8c67f82668abdd7a0afa115 (diff)
parent5204644c0fd1cf8ef20b4671ec1c45e87701b25e (diff)
Merge "Enable Dovetail Push Results to DB"
-rwxr-xr-xjjb/dovetail/dovetail-run.sh9
1 files changed, 7 insertions, 2 deletions
diff --git a/jjb/dovetail/dovetail-run.sh b/jjb/dovetail/dovetail-run.sh
index 04b11fdd1..ef11fc15a 100755
--- a/jjb/dovetail/dovetail-run.sh
+++ b/jjb/dovetail/dovetail-run.sh
@@ -35,6 +35,8 @@ ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
sshkey=""
+TEST_DB_URL=http://testresults.opnfv.org/test/api/v1/results
+
check_file_exists() {
if [[ -f $1 ]]; then
echo 0
@@ -402,7 +404,10 @@ fi
echo "Dovetail: Pulling image ${DOCKER_REPO}:${DOCKER_TAG}"
docker pull ${DOCKER_REPO}:$DOCKER_TAG >$redirect
-cmd="docker run ${opts} -e DOVETAIL_HOME=${DOVETAIL_HOME} ${docker_volume} ${dovetail_home_volume} \
+cmd="docker run ${opts} -e DOVETAIL_HOME=${DOVETAIL_HOME} -e INSTALLER_TYPE=${INSTALLER_TYPE} \
+ -e DEPLOY_SCENARIO=${DEPLOY_SCENARIO} -e NODE_NAME=${NODE_NAME} -e BUILD_TAG=${BUILD_TAG} \
+ -e TEST_DB_URL=${TEST_DB_URL} -e VERSION=${SUT_BRANCH} \
+ ${docker_volume} ${dovetail_home_volume} \
${sshkey} ${DOCKER_REPO}:${DOCKER_TAG} /bin/bash"
echo "Dovetail: running docker run command: ${cmd}"
${cmd} >${redirect}
@@ -462,7 +467,7 @@ else
testarea="--testarea ${TESTAREA}"
fi
-run_cmd="dovetail run ${testsuite} ${testarea} --deploy-scenario ${DEPLOY_SCENARIO} -d -r"
+run_cmd="dovetail run ${testsuite} ${testarea} --deploy-scenario ${DEPLOY_SCENARIO} -d -r --opnfv-ci"
echo "Container exec command: ${run_cmd}"
docker exec $container_id ${run_cmd}