summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFatih Degirmenci <fdegir@gmail.com>2018-01-22 14:36:47 +0100
committerFatih Degirmenci <fdegir@gmail.com>2018-01-22 14:36:47 +0100
commit3ea5c44e46f91724e1c351a02050bf4e858f1a51 (patch)
tree7eada4b7c1447f24349352afdbc1fa0106bdb1ac
parent08e50bf62c2a588dfb549096f6103dd3a6f1f359 (diff)
xci: Clone the repo and checkout the patch for testing
Change-Id: Ie1c2f76b6043133c3821272040b1a2a38de29035 Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>
-rw-r--r--jjb/xci/xci-merge-jobs.yml3
-rwxr-xr-xjjb/xci/xci-start-new-vm.sh6
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