Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "[storperf] Create stable/gambia branch"
[releng.git]
/
jjb
/
xci
/
xci-start-new-vm.sh
diff --git
a/jjb/xci/xci-start-new-vm.sh
b/jjb/xci/xci-start-new-vm.sh
index
d676e26
..
79b6a78
100755
(executable)
--- a/
jjb/xci/xci-start-new-vm.sh
+++ b/
jjb/xci/xci-start-new-vm.sh
@@
-14,6
+14,9
@@
# what you are doing.
#----------------------------------------------------------------------
# what you are doing.
#----------------------------------------------------------------------
+# ensure GERRIT_TOPIC is set
+GERRIT_TOPIC="${GERRIT_TOPIC:-''}"
+
# skip the deployment if the patch doesn't impact the deployment
if [[ "$GERRIT_TOPIC" =~ 'skip-verify' ]]; then
echo "Skipping the deployment!"
# skip the deployment if the patch doesn't impact the deployment
if [[ "$GERRIT_TOPIC" =~ 'skip-verify' ]]; then
echo "Skipping the deployment!"
@@
-53,21
+56,35
@@
export DEPLOY_SCENARIO=$DEPLOY_SCENARIO
export FUNCTEST_MODE=$FUNCTEST_MODE
export FUNCTEST_SUITE_NAME=$FUNCTEST_SUITE_NAME
export XCI_FLAVOR=$XCI_FLAVOR
export FUNCTEST_MODE=$FUNCTEST_MODE
export FUNCTEST_SUITE_NAME=$FUNCTEST_SUITE_NAME
export XCI_FLAVOR=$XCI_FLAVOR
+export CORE_OPENSTACK_INSTALL=true
+export BIFROST_USE_PREBUILT_IMAGES=true
export CLEAN_DIB_IMAGES=$CLEAN_DIB_IMAGES
export OPNFV_RELENG_DEV_PATH=/home/devuser/releng-xci/
export INSTALLER_TYPE=$INSTALLER_TYPE
export GIT_BASE=$GIT_BASE
export JENKINS_HOME=$JENKINS_HOME
export CLEAN_DIB_IMAGES=$CLEAN_DIB_IMAGES
export OPNFV_RELENG_DEV_PATH=/home/devuser/releng-xci/
export INSTALLER_TYPE=$INSTALLER_TYPE
export GIT_BASE=$GIT_BASE
export JENKINS_HOME=$JENKINS_HOME
+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
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
chmod a+x xci_test.sh
export XCI_BUILD_CLEAN_VM_OS=false