From: MatthewLi <matthew.lijun@huawei.com>
Date: Tue, 6 Dec 2016 12:19:02 +0000 (-0500)
Subject: dovetail: bugfix for cmd running
X-Git-Tag: danube.1.0~594
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=12feb50ad649b223ed4dad4874f453362bdb2cbe;p=releng.git

dovetail: bugfix for cmd running

JIRA: DOVETAIL-150

Change-Id: Ia1e26b99cc8591fb17169c13c59138db2237a2c2
Signed-off-by: MatthewLi <matthew.lijun@huawei.com>
---

diff --git a/jjb/dovetail/dovetail-run.sh b/jjb/dovetail/dovetail-run.sh
index c792b1e6b..a310d5258 100755
--- a/jjb/dovetail/dovetail-run.sh
+++ b/jjb/dovetail/dovetail-run.sh
@@ -47,11 +47,11 @@ docker pull opnfv/dovetail:$DOCKER_TAG >$redirect
 
 # Run docker
 echo "Dovetail: docker running..."
-cmds = "${DOVETAIL_REPO_DIR}/dovetail/run.py --testsuite $TESTSUITE"
-sudo docker run ${opts} ${envs} ${labconfig} ${sshkey} opnfv/dovetail:${DOCKER_TAG} ${cmds}
+sudo docker run ${opts} ${envs} ${labconfig} ${sshkey} opnfv/dovetail:${DOCKER_TAG} \
+"${DOVETAIL_REPO_DIR}/dovetail/run.py --testsuite ${TESTSUITE}"
 
 echo "Dovetail: store results..."
-sudo cp -r /home/opnfv/dovetail/results ./
+sudo cp -r ${DOVETAIL_REPO_DIR}/results ./
 #To make sure the file owner is jenkins, for the copied results files in the above line
 #if not, there will be error when next time to wipe workspace
 sudo chown -R jenkins:jenkins ${WORKSPACE}/results