From: xudan <xudan16@huawei.com>
Date: Sat, 27 May 2017 01:28:03 +0000 (-0400)
Subject: Bugfix: Dovetail CI fail because of no env variable and wrong results path
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=504fb4bc7d3d26f7442230a55a4d4410fe94b415;p=releng.git

Bugfix: Dovetail CI fail because of no env variable and wrong results path

JIRA: DOVETAIL-438

Change-Id: I8e5fa8cfbbcaf1828ecd7290fbbc8a6b0a80bae2
Signed-off-by: xudan <xudan16@huawei.com>
---

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}