Run tempest tests from sahara-tests for sahara jobs

Make sure that sahara-tests is installed in the tempest virtualenv, so
that the tempest tests shipped with it are found and executed.

Change-Id: Ifb2ded543f7595c7483e417f21f8dd293bb0269e
This commit is contained in:
Luigi Toscano 2016-06-08 12:25:38 +02:00
parent b18ceeaf33
commit cd068cc867
1 changed files with 7 additions and 2 deletions

View File

@ -183,11 +183,14 @@
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TEMPEST=1
export DEVSTACK_GATE_TEMPEST_REGEX="data_processing"
export DEVSTACK_LOCAL_CONFIG="export TEMPEST_PLUGINS='/opt/stack/new/sahara-tests'"
export PROJECTS="openstack/sahara-tests $PROJECTS"
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"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin sahara git://git.openstack.org/openstack/sahara"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer"
fi
export BRANCH_OVERRIDE={branch-override}
@ -325,9 +328,11 @@
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
export DEVSTACK_LOCAL_CONFIG="enable_plugin sahara git://git.openstack.org/openstack/sahara"
export DEVSTACK_GATE_NEUTRON=1
export DEVSTACK_GATE_TEMPEST=1
export DEVSTACK_GATE_TEMPEST_FULL=1
export DEVSTACK_GATE_NEUTRON=1
export DEVSTACK_LOCAL_CONFIG+=$'\n'"export TEMPEST_PLUGINS='/opt/stack/new/sahara-tests'"
export PROJECTS="openstack/sahara-tests $PROJECTS"
export BRANCH_OVERRIDE={branch-override}
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE