openstack/project-config
Code Issues Proposed changes

Fix Sahara config for DevStack on stable branches

Browse Source 
The configuration is different in Kilo, where DevStack still supports
Sahara directly (the plugin was introduced afterwards).

This review fixes the tests like '*-tempest-dsvm-sahara*' and
it complements the previous fix for the other tests.

Change-Id: I4f6e3a3692fa8beede22ec6e6ccfa893ae21d316
This commit is contained in:
Luigi Toscano 2016-02-01 09:41:34 +01:00
parent 65c17b4dfe
commit 74575bfd9b
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
jenkins/jobs/sahara.yaml
View File

@ -203,7 +203,12 @@
export DEVSTACK_GATE_TIMEOUT=120
export DEVSTACK_GATE_TEMPEST=1
export DEVSTACK_GATE_TEMPEST_REGEX="data_processing"
if [[ "stable/kilo" =~ $ZUUL_BRANCH ]]; then
# Sahara was moved out of DevStack as plugin after Kilo
export DEVSTACK_GATE_SAHARA=1
else
export DEVSTACK_LOCAL_CONFIG="enable_plugin sahara git://git.openstack.org/openstack/sahara"
fi
export BRANCH_OVERRIDE={branch-override}
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE