Merge "remove liberty workaround for sahara-dashboard"
This commit is contained in:
commit
e04a0f723b
@ -21,10 +21,7 @@
|
||||
export DEVSTACK_GATE_INSTALL_TESTONLY=1
|
||||
export DEVSTACK_GATE_NEUTRON=1
|
||||
export DEVSTACK_LOCAL_CONFIG="enable_plugin sahara git://git.openstack.org/openstack/sahara"
|
||||
if [[ ! "stable/liberty" =~ $ZUUL_BRANCH ]]; then
|
||||
# sahara-dashboard was split out from Horizon after Liberty
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin sahara-dashboard git://git.openstack.org/openstack/sahara-dashboard"
|
||||
fi
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin sahara-dashboard git://git.openstack.org/openstack/sahara-dashboard"
|
||||
|
||||
function pre_test_hook {
|
||||
cd /opt/stack/new/sahara-dashboard/tools/gate/integration
|
||||
|
Loading…
Reference in New Issue
Block a user