From 70a882c9c557e11cc9805e2bed3d1e7cdea2d126 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Tue, 8 Dec 2015 11:19:49 +0100
Subject: [PATCH] Remove juno handling from manila Jenkins jobs

With stable/juno eol'ed, we do not need to check anymore for
stable/juno, remove special handling.

Change-Id: I790fa8bd8eedca6d8007314f8ffa70232cbe22ba
---
 jenkins/jobs/manila.yaml | 53 ++++++++++++----------------------------
 1 file changed, 16 insertions(+), 37 deletions(-)

diff --git a/jenkins/jobs/manila.yaml b/jenkins/jobs/manila.yaml
index 90538f17e8..ea8651be61 100644
--- a/jenkins/jobs/manila.yaml
+++ b/jenkins/jobs/manila.yaml
@@ -21,16 +21,10 @@
           export DEVSTACK_GATE_POSTGRES={postgres_enabled}
           export ENABLED_SERVICES=tempest
 
-          if [[ $ZUUL_BRANCH = "stable/juno" ]]; then
-              # Juno version uses 'hooks' approach that requires explicit
-              # enabling of services.
-              ENABLED_SERVICES+=,manila,m-api,m-shr,m-sch
-          else
-              # Enable manila devstack plugin. Provided repo should be
-              # cloned by zuul before devstack run and below provided
-              # link should not be used.
-              export DEVSTACK_LOCAL_CONFIG="enable_plugin manila git://git.openstack.org/openstack/manila"
-          fi
+          # Enable manila devstack plugin. Provided repo should be
+          # cloned by zuul before devstack run and below provided
+          # link should not be used.
+          export DEVSTACK_LOCAL_CONFIG="enable_plugin manila git://git.openstack.org/openstack/manila"
 
           # Keep localrc to be able to set some vars in pre_test_hook
           export KEEP_LOCALRC=1
@@ -76,15 +70,10 @@
           export DEVSTACK_GATE_NEUTRON=1
           export PROJECTS="openstack/python-manilaclient $PROJECTS"
 
-          if [[ $ZUUL_BRANCH = "stable/juno" ]]; then
-              # Juno version uses 'hooks' approach that requires explicit
-              # enabling of services.
-              ENABLED_SERVICES+=,manila,m-api,m-shr,m-sch
-          else
-              # Enable manila devstack plugin. Provided repo should be cloned by zuul before devstack run
-              # and below provided link should not be used.
-              export DEVSTACK_LOCAL_CONFIG="enable_plugin manila git://git.openstack.org/openstack/manila"
-          fi
+          # Enable manila devstack plugin. Provided repo should be
+          # cloned by zuul before devstack run and below provided link
+          # should not be used.
+          export DEVSTACK_LOCAL_CONFIG="enable_plugin manila git://git.openstack.org/openstack/manila"
 
           # Keep localrc to be able to set some vars in pre_test_hook
           export KEEP_LOCALRC=1
@@ -155,15 +144,10 @@
           export ENABLED_SERVICES=tempest
           export PROJECTS="openstack/devstack-plugin-glusterfs $PROJECTS"
 
-          if [[ $ZUUL_BRANCH = "stable/juno" ]]; then
-              # Juno version uses 'hooks' approach that requires explicit
-              # enabling of services.
-              ENABLED_SERVICES+=,manila,m-api,m-shr,m-sch
-          else
-              # Enable manila devstack plugin. Provided repo should be cloned by zuul before devstack run
-              # and below provided link should not be used.
-              export DEVSTACK_LOCAL_CONFIG="enable_plugin manila git://git.openstack.org/openstack/manila"
-          fi
+          # Enable manila devstack plugin. Provided repo should be
+          # cloned by zuul before devstack run and below provided link
+          # should not be used.
+          export DEVSTACK_LOCAL_CONFIG="enable_plugin manila git://git.openstack.org/openstack/manila"
 
           # Enable devstack-plugin-glusterfs plugin, to install and configure GlusterFS.
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin devstack-plugin-glusterfs git://git.openstack.org/stackforge/devstack-plugin-glusterfs"
@@ -218,15 +202,10 @@
           export ENABLED_SERVICES=tempest
           export PROJECTS="openstack/devstack-plugin-glusterfs $PROJECTS"
 
-          if [[ $ZUUL_BRANCH = "stable/juno" ]]; then
-              # Juno version uses 'hooks' approach that requires explicit
-              # enabling of services.
-              ENABLED_SERVICES+=,manila,m-api,m-shr,m-sch
-          else
-              # Enable manila devstack plugin. Provided repo should be cloned by zuul before devstack run
-              # and below provided link should not be used.
-              export DEVSTACK_LOCAL_CONFIG="enable_plugin manila git://git.openstack.org/openstack/manila"
-          fi
+          # Enable manila devstack plugin. Provided repo should be
+          # cloned by zuul before devstack run and below provided link
+          # should not be used.
+          export DEVSTACK_LOCAL_CONFIG="enable_plugin manila git://git.openstack.org/openstack/manila"
 
           # Enable devstack-plugin-glusterfs plugin, to install and configure GlusterFS.
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin devstack-plugin-glusterfs git://git.openstack.org/stackforge/devstack-plugin-glusterfs"