From: Markos Chandras <mchandras@suse.de>
Date: Wed, 9 May 2018 10:41:42 +0000 (+0100)
Subject: jjb: xci: xci-start-new-vm: Fix gerrit variable for git SHA
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F09%2F57209%2F2;p=releng.git

jjb: xci: xci-start-new-vm: Fix gerrit variable for git SHA

The gerrit variable for the git SHA is GERRIT_PATCHSET_REVISION instead
of GERRIT_CHANGE_ID. We also need to export the XCI_ANSIBLE_PARAMS
variable.

Change-Id: I206820f1155a4876fb7d87cc0b5ae1b8afb06bd6
Signed-off-by: Markos Chandras <mchandras@suse.de>
---

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