X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fxci%2Fxci-start-new-vm.sh;h=79b6a785a1a630072ea779f8bcada3cb48275bfa;hb=d53c8f03e314462ac1d9e475cc28ca750a2d5b56;hp=dd953e9270672132a2b5365e1fe988757fca7cec;hpb=4935770c3b592b01e5710703dcfd2e97684b5b3b;p=releng.git diff --git a/jjb/xci/xci-start-new-vm.sh b/jjb/xci/xci-start-new-vm.sh index dd953e927..79b6a785a 100755 --- a/jjb/xci/xci-start-new-vm.sh +++ b/jjb/xci/xci-start-new-vm.sh @@ -67,15 +67,24 @@ export CI_LOOP=$CI_LOOP 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 - +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 [[ $GERRIT_PROJECT != "releng-xci" ]]; then + cat > scenario_overrides.yml <<-EOF +--- +xci_scenarios_overrides: + - scenario: $DEPLOY_SCENARIO + version: $GERRIT_PATCHSET_REVISION + refspec: $GERRIT_REFSPEC +EOF +fi + chmod a+x xci_test.sh export XCI_BUILD_CLEAN_VM_OS=false