openstack/project-config
Code Issues Proposed changes

Fix Manila jobs for running on stable/juno branch

Browse Source 
Manila uses 'plugin' approach in Devstack since Kilo. So, when Manila Tempest
jobs are running against 'stable/juno' branch of Manila it is just not
installed and all Tempest tests are skipped because of that. So, make jobs
distinguish two different approaches for setup of Manila using Devstack.

Change-Id: Ifb020fe8693fd4f014e944aad0c96a1e67843e4e
This commit is contained in:
Valeriy Ponomaryov 2015-06-18 17:15:16 +03:00
parent 70fc81ce91
commit 02fa6bb10d
1 changed files with 60 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
jenkins/jobs/manila.yaml
View File

@ -18,9 +18,16 @@
export DEVSTACK_GATE_NEUTRON=1
export DEVSTACK_GATE_POSTGRES=1
export ENABLED_SERVICES=tempest
# 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"
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
@ -63,9 +70,16 @@
export DEVSTACK_GATE_TIMEOUT=60
export DEVSTACK_GATE_NEUTRON=1
export ENABLED_SERVICES=tempest
# 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"
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
@ -108,9 +122,16 @@
export DEVSTACK_GATE_TIMEOUT=60
export DEVSTACK_GATE_NEUTRON=1
export ENABLED_SERVICES=tempest
# 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"
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
@ -153,9 +174,16 @@
export DEVSTACK_GATE_TIMEOUT=60
export DEVSTACK_GATE_NEUTRON=1
export ENABLED_SERVICES=tempest
# 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"
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
@ -198,9 +226,16 @@
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TIMEOUT=60
export DEVSTACK_GATE_NEUTRON=1
# 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"
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
@ -243,9 +278,16 @@
export DEVSTACK_GATE_TIMEOUT=60
export DEVSTACK_GATE_NEUTRON=1
export ENABLED_SERVICES=tempest
# 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"
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