From 74575bfd9bf8a1f8a121c16226b0e12c09d66b8f Mon Sep 17 00:00:00 2001 From: Luigi Toscano Date: Mon, 1 Feb 2016 09:41:34 +0100 Subject: [PATCH] Fix Sahara config for DevStack on stable branches 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 --- jenkins/jobs/sahara.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/jenkins/jobs/sahara.yaml b/jenkins/jobs/sahara.yaml index 726176576b..c375366011 100644 --- a/jenkins/jobs/sahara.yaml +++ b/jenkins/jobs/sahara.yaml @@ -203,7 +203,12 @@ export DEVSTACK_GATE_TIMEOUT=120 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_TEMPEST_REGEX="data_processing" - export DEVSTACK_LOCAL_CONFIG="enable_plugin sahara git://git.openstack.org/openstack/sahara" + 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