From c6d6fdb77fb298540d90a8185d165f06f72a28b3 Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Thu, 17 May 2018 09:11:11 +0100 Subject: jjb: xci: Do not check for the WORKSPACE variable The WORKSPACE variable is always set so we do not need to check it in the script. Change-Id: I33d2e17b9a4a7b262c781c7442cc69c2433f8729 Signed-off-by: Markos Chandras --- jjb/xci/xci-start-new-vm.sh | 4 ++-- 1 file 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: -- cgit 1.2.3-korg