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

.zuul.yaml

@@ -119,6 +119,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

neutron/tests/fullstack/resources/config.py

@@ -74,7 +74,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,

neutron/tests/fullstack/resources/environment.py

@@ -40,7 +40,7 @@ class EnvironmentDescription(object):
                  agent_down_time=75, router_scheduler=None,
                  global_mtu=common_const.DEFAULT_NETWORK_MTU,
                  debug_iptables=False, log=False, report_bandwidths=False,
-                 ml2_extension_drivers=None):
+                 ml2_extension_drivers=None, api_workers=1):
         self.network_type = network_type
         self.l2_pop = l2_pop
         self.qos = qos
@@ -59,6 +59,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):

neutron/tests/fullstack/test_dhcp_agent.py

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

tox.ini

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