Browse Source

Merge "Limit usage of resources in the fullstack tests job" into stable/train

changes/30/774130/1
Zuul 5 months ago
committed by Gerrit Code Review
parent
commit
7f647fd223
5 changed files with 8 additions and 4 deletions
  1. +1
    -0
      .zuul.yaml
  2. +1
    -1
      neutron/tests/fullstack/resources/config.py
  3. +2
    -1
      neutron/tests/fullstack/resources/environment.py
  4. +3
    -1
      neutron/tests/fullstack/test_dhcp_agent.py
  5. +1
    -1
      tox.ini

+ 1
- 0
.zuul.yaml View File

@ -130,6 +130,7 @@
devstack_services:
# Ignore any default set by devstack. Emit a "disable_all_services".
base: false
etcd3: false
devstack_localrc:
USE_PYTHON3: true
INSTALL_TESTONLY_PACKAGES: true


+ 1
- 1
neutron/tests/fullstack/resources/config.py View File

@ -83,7 +83,7 @@ class NeutronConfigFixture(ConfigFixture):
'password': rabbitmq_environment.password,
'host': rabbitmq_environment.host,
'vhost': rabbitmq_environment.vhost},
'api_workers': '2',
'api_workers': str(env_desc.api_workers),
},
'database': {
'connection': connection,


+ 2
- 1
neutron/tests/fullstack/resources/environment.py View File

@ -40,7 +40,7 @@ class EnvironmentDescription(object):
global_mtu=constants.DEFAULT_NETWORK_MTU,
debug_iptables=False, log=False, report_bandwidths=False,
has_placement=False, placement_port=None,
ml2_extension_drivers=None):
ml2_extension_drivers=None, api_workers=1):
self.network_type = network_type
self.l2_pop = l2_pop
self.qos = qos
@ -61,6 +61,7 @@ class EnvironmentDescription(object):
if self.log:
self.service_plugins += ',log'
self.ml2_extension_drivers = ml2_extension_drivers
self.api_workers = api_workers
@property
def tunneling_enabled(self):


+ 3
- 1
neutron/tests/fullstack/test_dhcp_agent.py View File

@ -36,6 +36,7 @@ class BaseDhcpAgentTest(base.BaseFullStackTestCase):
(constants.AGENT_TYPE_LINUXBRIDGE,
{'l2_agent_type': constants.AGENT_TYPE_LINUXBRIDGE})
]
api_workers = 1
def setUp(self):
host_descriptions = [
@ -48,7 +49,8 @@ class BaseDhcpAgentTest(base.BaseFullStackTestCase):
environment.EnvironmentDescription(
l2_pop=False,
arp_responder=False,
agent_down_time=self.agent_down_time),
agent_down_time=self.agent_down_time,
api_workers=self.api_workers),
host_descriptions)
super(BaseDhcpAgentTest, self).setUp(env)


+ 1
- 1
tox.ini View File

@ -96,7 +96,7 @@ deps =
commands =
{toxinidir}/tools/generate_dhclient_script_for_fullstack.sh {envdir}
{toxinidir}/tools/deploy_rootwrap.sh {toxinidir} {envdir}/etc {envdir}/bin
stestr run --concurrency 4 {posargs}
stestr run --concurrency 3 {posargs}
[testenv:releasenotes]
basepython = python3


Loading…
Cancel
Save