openstack
/
ironic-inspector
Code Issues Proposed changes

Merge "Only disable Neutron tests when our Grenade is running"

This commit is contained in:
Jenkins 2016-10-20 16:34:35 +00:00 committed by Gerrit Code Review
parent 284ad7aed5 4eb77865ab
commit 0334c7e390
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devstack/upgrade/settings
View File

@ -12,3 +12,7 @@ devstack_localrc base enable_service ironic-inspector ironic-inspector-dhcp
devstack_localrc target enable_plugin ironic-inspector https://github.com/openstack/ironic-inspector devstack_localrc target enable_plugin ironic-inspector https://github.com/openstack/ironic-inspector
devstack_localrc target enable_service ironic-inspector ironic-inspector-dhcp devstack_localrc target enable_service ironic-inspector ironic-inspector-dhcp
# NOTE(dtantsur): enable possible work arounds for grenade specifically.
# We can't use shell variables "thanks" to tempest using tox.
touch /tmp/ironic-inspector-grenade

5
ironic_inspector/test/inspector_tempest_plugin/plugin.py
View File

@ -33,8 +33,9 @@ class InspectorTempestPlugin(plugins.TempestPlugin):
conf.register_group(config.baremetal_introspection_group) conf.register_group(config.baremetal_introspection_group)
conf.register_opts(config.BaremetalIntrospectionGroup, conf.register_opts(config.BaremetalIntrospectionGroup,
group="baremetal_introspection") group="baremetal_introspection")
# FIXME(dtantsur): pretend like Neutron does not exist due to random if os.path.exists('/tmp/ironic-inspector-grenade'):
# failures, see https://bugs.launchpad.net/bugs/1621791. # FIXME(dtantsur): pretend like Neutron does not exist due to
# random failures, see https://bugs.launchpad.net/bugs/1621791.
cfg.CONF.set_override('neutron', False, 'service_available') cfg.CONF.set_override('neutron', False, 'service_available')
def get_opt_lists(self): def get_opt_lists(self):