From 32e52e5abbf98b17cf542acdac9697b9e32ae3bd Mon Sep 17 00:00:00 2001 From: Vitaly Gridnev Date: Fri, 22 Jul 2016 20:48:14 +0300 Subject: [PATCH] remove liberty workaround for sahara-dashboard integration tests for sahara-dashboard doesn't have liberty branch. Change-Id: I526d7f828fe103c092f4def4c4cc5bf201a2f9f8 --- jenkins/jobs/sahara.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/jenkins/jobs/sahara.yaml b/jenkins/jobs/sahara.yaml index 6c251dfff2..889e095526 100644 --- a/jenkins/jobs/sahara.yaml +++ b/jenkins/jobs/sahara.yaml @@ -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