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

changes/03/386703/7
Jenkins 6 years ago committed by Gerrit Code Review
commit 0334c7e390
  1. 4
      devstack/upgrade/settings
  2. 7
      ironic_inspector/test/inspector_tempest_plugin/plugin.py

@ -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_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

@ -33,9 +33,10 @@ class InspectorTempestPlugin(plugins.TempestPlugin):
conf.register_group(config.baremetal_introspection_group)
conf.register_opts(config.BaremetalIntrospectionGroup,
group="baremetal_introspection")
# 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')
if os.path.exists('/tmp/ironic-inspector-grenade'):
# 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')
def get_opt_lists(self):
return [

Loading…
Cancel
Save