summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFatih Degirmenci <fdegir@gmail.com>2018-05-17 09:39:20 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-05-17 09:39:20 +0000
commit9c2f3e7d4a21c7365e70d1dfdfe6d682adb94f12 (patch)
tree17be94ba9db8025f1b07de074f9471aacae7b45e
parentafff1f88a918215eeb9060c4f43c5a332c8eb32c (diff)
parentc6d6fdb77fb298540d90a8185d165f06f72a28b3 (diff)
Merge "jjb: xci: Do not check for the WORKSPACE variable"
-rwxr-xr-xjjb/xci/xci-start-new-vm.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/jjb/xci/xci-start-new-vm.sh b/jjb/xci/xci-start-new-vm.sh
index 174932813..79b6a785a 100755
--- a/jjb/xci/xci-start-new-vm.sh
+++ b/jjb/xci/xci-start-new-vm.sh
@@ -67,7 +67,7 @@ export CI_LOOP=$CI_LOOP
export BUILD_TAG=$BUILD_TAG
export NODE_NAME=$NODE_NAME
-if [[ ! -z ${WORKSPACE+x} && $GERRIT_PROJECT != "releng-xci" ]]; then
+if [[ $GERRIT_PROJECT != "releng-xci" ]]; then
export XCI_ANSIBLE_PARAMS="-e @/home/devuser/releng-xci/scenario_overrides.yml"
fi
@@ -75,7 +75,7 @@ cd xci
./xci-deploy.sh | ts
EOF
-if [[ ! -z ${WORKSPACE+x} && $GERRIT_PROJECT != "releng-xci" ]]; then
+if [[ $GERRIT_PROJECT != "releng-xci" ]]; then
cat > scenario_overrides.yml <<-EOF
---
xci_scenarios_overrides: