X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fxci%2Fxci-start-new-vm.sh;h=174932813bf190669c0d9b3f379e4d5e94d01e60;hb=db7f38351e5a8f5a98ae50874e403b3bc232da2b;hp=dd953e9270672132a2b5365e1fe988757fca7cec;hpb=a2ffc4d1f172b81ec1bdf4ba7e8b00a199b97660;p=releng.git diff --git a/jjb/xci/xci-start-new-vm.sh b/jjb/xci/xci-start-new-vm.sh index dd953e927..174932813 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 - + 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 + 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