summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJun Li <matthew.lijun@huawei.com>2017-05-27 01:35:23 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-05-27 01:35:23 +0000
commitac47a5607514d7f78010a106e75de469cce0724f (patch)
tree03d84c8da4e4df5988a64f18050507da36fe735a
parentb70328badbe942f02b288b18f46ed7c25bc176d9 (diff)
parent504fb4bc7d3d26f7442230a55a4d4410fe94b415 (diff)
Merge "Bugfix: Dovetail CI fail because of no env variable and wrong results path"
-rwxr-xr-xjjb/dovetail/dovetail-run.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/jjb/dovetail/dovetail-run.sh b/jjb/dovetail/dovetail-run.sh
index f323a8ab5..a30aa5346 100755
--- a/jjb/dovetail/dovetail-run.sh
+++ b/jjb/dovetail/dovetail-run.sh
@@ -108,7 +108,7 @@ dovetail_home_volume="-v ${DOVETAIL_HOME}:${DOVETAIL_HOME}"
echo "Dovetail: Pulling image opnfv/dovetail:${DOCKER_TAG}"
docker pull opnfv/dovetail:$DOCKER_TAG >$redirect
-cmd="docker run ${opts} -e ${DOVETAIL_HOME} ${docker_volume} ${dovetail_home_volume} \
+cmd="docker run ${opts} -e DOVETAIL_HOME=${DOVETAIL_HOME} ${docker_volume} ${dovetail_home_volume} \
${sshkey} opnfv/dovetail:${DOCKER_TAG} /bin/bash"
echo "Dovetail: running docker run command: ${cmd}"
${cmd} >${redirect}
@@ -136,7 +136,7 @@ docker exec $container_id ${list_cmd}
echo "Container exec command: ${run_cmd}"
docker exec $container_id ${run_cmd}
-sudo cp -r ${DOVETAIL_HOME}/results ./
+sudo cp -r ${DOVETAIL_CONFIG}/results ./
# To make sure the file owner is the current user, for the copied results files in the above line
# if not, there will be error when next time to wipe workspace
# CURRENT_USER=${SUDO_USER:-$USER}