summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorMarkos Chandras <mchandras@suse.de>2018-04-26 15:25:06 +0100
committerMarkos Chandras <mchandras@suse.de>2018-05-08 08:52:26 +0100
commit6ae13c7c86e693319d90009edd089c6a781f823e (patch)
tree22a193cd327c39256b33c298855841cb0790e445 /jjb
parent4be3e4a21b161c2602ececefe8ff11114a9348f5 (diff)
jjb: xci: xci-start-new-vm: Create scenario overrides file
Pass scenario information using the new override mechanism. This patch depends on the matching releng-xci change https://gerrit.opnfv.org/gerrit/#/c/56643/ Change-Id: Ib8473249e424f259f5757ebdaed7d73fa4b0adce Signed-off-by: Markos Chandras <mchandras@suse.de>
Diffstat (limited to 'jjb')
-rwxr-xr-xjjb/xci/xci-start-new-vm.sh15
1 files changed, 12 insertions, 3 deletions
diff --git a/jjb/xci/xci-start-new-vm.sh b/jjb/xci/xci-start-new-vm.sh
index dd953e927..f1585b9f0 100755
--- a/jjb/xci/xci-start-new-vm.sh
+++ b/jjb/xci/xci-start-new-vm.sh
@@ -68,14 +68,23 @@ export BUILD_TAG=$BUILD_TAG
export NODE_NAME=$NODE_NAME
if [[ ! -z ${WORKSPACE+x} && $GERRIT_PROJECT != "releng-xci" ]]; then
- git clone https://gerrit.opnfv.org/gerrit/$GERRIT_PROJECT xci/scenarios/$DEPLOY_SCENARIO && cd xci/scenarios/$DEPLOY_SCENARIO
- git fetch https://gerrit.opnfv.org/gerrit/$GERRIT_PROJECT $GERRIT_REFSPEC && git checkout FETCH_HEAD
- cd -
+ 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
+ cat > scenario_overrides.yml <<-EOF
+---
+xci_scenarios_overrides:
+ - scenario: $DEPLOY_SCENARIO
+ version: $GERRIT_CHANGE_ID
+ refspec: $GERRIT_REFSPEC
+EOF
+fi
+
chmod a+x xci_test.sh
export XCI_BUILD_CLEAN_VM_OS=false