openstack/project-config
Code Issues Proposed changes

[Manila] Fix grenade job settings

Browse Source 
Manila uses plugin mechanism for enabling devstack and grenade plugins.
Design of grenade plugin assumes that it enables devstack plugin
using specific versions via its config. But now, CI job enables master
version of devstack plugin. It leads to duplication, manila installation
runs twice and, therefore, fails.
Remove redundant string from grenade job configuration for Manila
project avoiding this duplication.

Also, remove 'DEVSTACK_GATE_TEMPEST=1' env var from job config as
manila's case does not require it. It triggers run of redundant
tests. But enable tempest via "ENABLED_SERVICES" to be able to
trigger tempest run in manila grenade scripts not depending on
'devstack-gate' project scripts in future.

Change-Id: Ib5b7df457101430813db89320dcc3d3f8438f252
This commit is contained in:
vponomaryov 2016-04-14 12:50:30 +03:00
parent a9b96f84de
commit d841397f29
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
jenkins/jobs/manila.yaml
View File

@ -147,14 +147,13 @@
export PROJECTS="openstack-dev/grenade $PROJECTS" export PROJECTS="openstack-dev/grenade $PROJECTS"
export PROJECTS="openstack/python-manilaclient $PROJECTS" export PROJECTS="openstack/python-manilaclient $PROJECTS"
export PYTHONUNBUFFERED=true export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TEMPEST=1
export DEVSTACK_GATE_NEUTRON=1 export DEVSTACK_GATE_NEUTRON=1
export DEVSTACK_GATE_GRENADE=pullup export DEVSTACK_GATE_GRENADE=pullup
export ENABLED_SERVICES=tempest
# Enable manila devstack plugin. Provided repo should be # Enable manila grenade plugin. Provided repo should be
# cloned by zuul before devstack run and below provided # cloned by zuul before devstack run and below provided
# link should not be used. Same for 'grenade' plugin. # link should not be used.
export DEVSTACK_LOCAL_CONFIG="enable_plugin manila git://git.openstack.org/openstack/manila"
export GRENADE_PLUGINRC="enable_grenade_plugin manila git://git.openstack.org/openstack/manila" export GRENADE_PLUGINRC="enable_grenade_plugin manila git://git.openstack.org/openstack/manila"
# Keep localrc to be able to set some vars in pre_test_hook # Keep localrc to be able to set some vars in pre_test_hook