openstack/project-config
Code Issues Proposed changes

Merge "remove liberty workaround for sahara-dashboard"

Browse Source
This commit is contained in:
Jenkins 2016-07-22 23:44:56 +00:00 committed by Gerrit Code Review
commit e04a0f723b
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
jenkins/jobs/sahara.yaml
View File

@ -21,10 +21,7 @@
export DEVSTACK_GATE_INSTALL_TESTONLY=1 export DEVSTACK_GATE_INSTALL_TESTONLY=1
export DEVSTACK_GATE_NEUTRON=1 export DEVSTACK_GATE_NEUTRON=1
export DEVSTACK_LOCAL_CONFIG="enable_plugin sahara git://git.openstack.org/openstack/sahara" 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" export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin sahara-dashboard git://git.openstack.org/openstack/sahara-dashboard"
fi
function pre_test_hook { function pre_test_hook {
cd /opt/stack/new/sahara-dashboard/tools/gate/integration cd /opt/stack/new/sahara-dashboard/tools/gate/integration