openstack/project-config
Code Issues Proposed changes

Merge "Remove juno handling from manila Jenkins jobs"

Browse Source
This commit is contained in:
Jenkins 2015-12-08 12:07:31 +00:00 committed by Gerrit Code Review
commit 8e0be8587b
1 changed files with 16 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
jenkins/jobs/manila.yaml
View File

@ -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
# 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.
# 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
# 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.
# 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 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.
# 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 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"