openstack/neutron
Code Issues Proposed changes

Merge "Limit usage of resources in the fullstack tests job"

Browse Source
This commit is contained in:
Zuul 2020-12-11 23:14:00 +00:00 committed by Gerrit Code Review
commit 60c6d392af
5 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/tests/fullstack/resources/config.py
View File

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

4
neutron/tests/fullstack/resources/environment.py
View File

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

3
neutron/tests/fullstack/test_dhcp_agent.py
View File

@ -38,6 +38,7 @@ class BaseDhcpAgentTest(base.BaseFullStackTestCase):
] ]
boot_vm_for_test = True boot_vm_for_test = True
dhcp_scheduler_class = None dhcp_scheduler_class = None
api_workers = 1
def setUp(self): def setUp(self):
host_descriptions = [ host_descriptions = [
@ -52,6 +53,7 @@ class BaseDhcpAgentTest(base.BaseFullStackTestCase):
arp_responder=False, arp_responder=False,
agent_down_time=self.agent_down_time, agent_down_time=self.agent_down_time,
dhcp_scheduler_class=self.dhcp_scheduler_class, dhcp_scheduler_class=self.dhcp_scheduler_class,
api_workers=self.api_workers,
), ),
host_descriptions) host_descriptions)
@ -205,6 +207,7 @@ class TestDhcpAgentHARaceCondition(BaseDhcpAgentTest):
agent_down_time = 30 agent_down_time = 30
number_of_hosts = 2 number_of_hosts = 2
boot_vm_for_test = False boot_vm_for_test = False
api_workers = 2
dhcp_scheduler_class = ('neutron.tests.fullstack.schedulers.dhcp.' dhcp_scheduler_class = ('neutron.tests.fullstack.schedulers.dhcp.'
'AlwaysTheOtherAgentScheduler') 'AlwaysTheOtherAgentScheduler')

2
tox.ini
View File

@ -76,7 +76,7 @@ deps =
commands = commands =
{toxinidir}/tools/generate_dhclient_script_for_fullstack.sh {envdir} {toxinidir}/tools/generate_dhclient_script_for_fullstack.sh {envdir}
{toxinidir}/tools/deploy_rootwrap.sh {toxinidir} {envdir}/etc {envdir}/bin {toxinidir}/tools/deploy_rootwrap.sh {toxinidir} {envdir}/etc {envdir}/bin
stestr run --concurrency 4 {posargs} stestr run --concurrency 3 {posargs}
[testenv:dsvm-fullstack-gate] [testenv:dsvm-fullstack-gate]
setenv = {[testenv:dsvm-fullstack]setenv} setenv = {[testenv:dsvm-fullstack]setenv}

1
zuul.d/base.yaml
View File

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