X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fxci%2Fxci-start-new-vm.sh;h=79b6a785a1a630072ea779f8bcada3cb48275bfa;hb=a3af06b28b81c6fc0de69c8a6186c2685f5609ce;hp=f1585b9f0401540dad164e53ed122f0501b9f797;hpb=1b95992f4d6162f33a10e86ea3a16fbd015efe75;p=releng.git

diff --git a/jjb/xci/xci-start-new-vm.sh b/jjb/xci/xci-start-new-vm.sh
index f1585b9f0..79b6a785a 100755
--- a/jjb/xci/xci-start-new-vm.sh
+++ b/jjb/xci/xci-start-new-vm.sh
@@ -67,20 +67,20 @@ export CI_LOOP=$CI_LOOP
 export BUILD_TAG=$BUILD_TAG
 export NODE_NAME=$NODE_NAME
 
-if [[ ! -z ${WORKSPACE+x} && $GERRIT_PROJECT != "releng-xci" ]]; then
-    XCI_ANSIBLE_PARAMS="-e /home/devuser/releng-xci/scenario_overrides.yml"
+if [[ $GERRIT_PROJECT != "releng-xci" ]]; then
+    export XCI_ANSIBLE_PARAMS="-e @/home/devuser/releng-xci/scenario_overrides.yml"
 fi
 
 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:
   - scenario: $DEPLOY_SCENARIO
-    version: $GERRIT_CHANGE_ID
+    version: $GERRIT_PATCHSET_REVISION
     refspec: $GERRIT_REFSPEC
 EOF
 fi