diff options
| -rw-r--r-- | jjb/xci/xci-merge-jobs.yml | 3 | ||||
| -rwxr-xr-x | jjb/xci/xci-start-new-vm.sh | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/jjb/xci/xci-merge-jobs.yml b/jjb/xci/xci-merge-jobs.yml index f4d039ba7..3013e4479 100644 --- a/jjb/xci/xci-merge-jobs.yml +++ b/jjb/xci/xci-merge-jobs.yml @@ -109,6 +109,9 @@ name: SLAVE_LABEL default: 'xci-virtual' - string: + name: DEPLOY_SCENARIO + default: '{scenario}' + - string: name: CLEAN_DIB_IMAGES default: 'true' - string: diff --git a/jjb/xci/xci-start-new-vm.sh b/jjb/xci/xci-start-new-vm.sh index 46bd3120c..745113b47 100755 --- a/jjb/xci/xci-start-new-vm.sh +++ b/jjb/xci/xci-start-new-vm.sh @@ -39,6 +39,12 @@ export INSTALLER_TYPE=$INSTALLER_TYPE export GIT_BASE=$GIT_BASE export JENKINS_HOME=$JENKINS_HOME +if [ ! -z ${WORKSPACE+x} ]; 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 - +fi + cd xci ./xci-deploy.sh EOF |