summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitri Mazmanov <dimitri.mazmanov@ericsson.com>2017-01-31 12:46:16 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-01-31 12:46:16 +0000
commit75f1aa02999ec5f63f3247ac41f4171e85676fe9 (patch)
tree7f11b829e6ed109191a61281f18915bfaf6b4601
parentf057dd453509db1421a50ee6a223d8dc2af54786 (diff)
parent877657a5f54fb7a49d2f423fb2080abcb2e6f2e0 (diff)
Merge "Fix export in the run.sh"
-rwxr-xr-xtools/keystone/run.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/keystone/run.sh b/tools/keystone/run.sh
index 8fe933f..a4dca82 100755
--- a/tools/keystone/run.sh
+++ b/tools/keystone/run.sh
@@ -20,7 +20,7 @@ set -o pipefail
INSTALLER_IP=10.20.0.2
# Runs on the jumphost
# if running as part of Jenkins job, read and create the files from/in WORKSPACE
-WORKSPACE=${WORKSPACE:-"/root"}
+export WORKSPACE=${WORKSPACE:-"/root"}
usage() {
echo "usage: $0 -a <installer_ip> -t (controller|compute) -r <runnable_script.sh> -d <data_file> -o <output_file>" >&2
@@ -94,7 +94,7 @@ function run_on_target() {
if [ -n "${output}" ]; then
#Fetch output file
sshpass -p r00tme ssh 2>/dev/null $ssh_options root@${installer_ip} \
- "ssh $ssh_options $1 \"cd /root/ && cat ${output}\"" > "${WORKSPACE}/${output}"
+ "ssh $ssh_options $1 \"cat /root/${output}\"" > ${WORKSPACE}/${output}
fi
}