Speed up gate jobs
The gate jobs have been timing out recently, which is causing them to fail. This patch skips some of the UTs inherited from the upstream ML2 test class, in an attempt to resolve this issue. This also updates references to stable/newton to reflect it's EOL status, and increase the test timeout. Change-Id: Ia34c8bfb5031145ec3b3531fe9c647dee14fb4f9 (cherry picked from commit41a5c5ff16) (cherry picked from commit847c59a140)
This commit is contained in:
Thomas Bachman
parent
37d4b078b3
commit
3f7f0bf189
|
|
@ -1,8 +1,8 @@
|
|||
[DEFAULT]
|
||||
test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
|
||||
OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
|
||||
OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-120} \
|
||||
OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-300} \
|
||||
# Temporarily exclude gbpservice/neutron contrib tests until nfp tests pass
|
||||
${PYTHON:-python} -m subunit.run discover -t ./ ${OS_TEST_PATH:-./gbpservice/neutron} $LISTOPT $IDOPTION
|
||||
${PYTHON:-python} -m subunit.run discover -t ./ ${OS_TEST_PATH:-./gbpservice/neutron/tests/unit/plugins} $LISTOPT $IDOPTION
|
||||
test_id_option=--load-list $IDFILE
|
||||
test_list_option=--list
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@ import copy
|
|||
import mock
|
||||
import netaddr
|
||||
import six
|
||||
import testtools
|
||||
|
||||
from aim.aim_lib import nat_strategy
|
||||
from aim import aim_manager
|
||||
|
|
@ -3483,24 +3484,10 @@ class TestPortBindingDvs(ApicAimTestCase):
|
|||
dvs_mock.assert_not_called()
|
||||
|
||||
|
||||
class TestMl2BasicGet(test_plugin.TestBasicGet,
|
||||
ApicAimTestCase):
|
||||
pass
|
||||
|
||||
|
||||
class TestMl2V2HTTPResponse(test_plugin.TestV2HTTPResponse,
|
||||
ApicAimTestCase):
|
||||
pass
|
||||
|
||||
|
||||
class TestMl2PortsV2(test_plugin.TestPortsV2,
|
||||
ApicAimTestCase):
|
||||
pass
|
||||
|
||||
|
||||
class TestMl2NetworksV2(test_plugin.TestNetworksV2,
|
||||
ApicAimTestCase):
|
||||
class TestDomains(ApicAimTestCase):
|
||||
|
||||
# REVISIT: Does this test anything that is not covered by
|
||||
# TestPortOnPhysicalNode.test_mixed_ports_on_network_with_default_domains?
|
||||
def test_aim_epg_domains(self):
|
||||
aim_ctx = aim_context.AimContext(self.db_session)
|
||||
self.aim_mgr.create(aim_ctx,
|
||||
|
|
@ -3517,19 +3504,51 @@ class TestMl2NetworksV2(test_plugin.TestNetworksV2,
|
|||
self.aim_mgr.create(aim_ctx,
|
||||
aim_resource.PhysicalDomain(name='ph2'),
|
||||
overwrite=True)
|
||||
with self.network(name='net'):
|
||||
epg = self.aim_mgr.find(aim_ctx, aim_resource.EndpointGroup)[0]
|
||||
self.assertEqual(set([]),
|
||||
set(epg.openstack_vmm_domain_names))
|
||||
self.assertEqual(set([]),
|
||||
set(epg.physical_domain_names))
|
||||
self._make_network(self.fmt, 'net', True)
|
||||
epg = self.aim_mgr.find(aim_ctx, aim_resource.EndpointGroup)[0]
|
||||
self.assertEqual(set([]),
|
||||
set(epg.openstack_vmm_domain_names))
|
||||
self.assertEqual(set([]),
|
||||
set(epg.physical_domain_names))
|
||||
|
||||
|
||||
# REVISIT: Skipping inherited ML2 tests to reduce UT run time.
|
||||
@testtools.skip('Skipping test class')
|
||||
class TestMl2BasicGet(test_plugin.TestBasicGet,
|
||||
ApicAimTestCase):
|
||||
pass
|
||||
|
||||
|
||||
# REVISIT: Skipping inherited ML2 tests to reduce UT run time.
|
||||
@testtools.skip('Skipping test class')
|
||||
class TestMl2V2HTTPResponse(test_plugin.TestV2HTTPResponse,
|
||||
ApicAimTestCase):
|
||||
pass
|
||||
|
||||
|
||||
# REVISIT: Skipping inherited ML2 tests to reduce UT run time.
|
||||
@testtools.skip('Skipping test class')
|
||||
class TestMl2PortsV2(test_plugin.TestPortsV2,
|
||||
ApicAimTestCase):
|
||||
pass
|
||||
|
||||
|
||||
# REVISIT: Skipping inherited ML2 tests to reduce UT run time.
|
||||
@testtools.skip('Skipping test class')
|
||||
class TestMl2NetworksV2(test_plugin.TestNetworksV2,
|
||||
ApicAimTestCase):
|
||||
pass
|
||||
|
||||
|
||||
# REVISIT: Skipping inherited ML2 tests to reduce UT run time.
|
||||
@testtools.skip('Skipping test class')
|
||||
class TestMl2SubnetsV2(test_plugin.TestSubnetsV2,
|
||||
ApicAimTestCase):
|
||||
pass
|
||||
|
||||
|
||||
# REVISIT: Skipping inherited ML2 tests to reduce UT run time.
|
||||
@testtools.skip('Skipping test class')
|
||||
class TestMl2SubnetPoolsV2(test_plugin.TestSubnetPoolsV2,
|
||||
ApicAimTestCase):
|
||||
pass
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@
|
|||
# under the License.
|
||||
|
||||
import mock
|
||||
import testtools
|
||||
|
||||
from neutron.api import extensions
|
||||
from neutron import manager
|
||||
|
|
@ -298,31 +299,43 @@ class TestAddressScope(Ml2PlusPluginV2TestCase):
|
|||
self.assertIsNone(post.call_args[0][0].original)
|
||||
|
||||
|
||||
# REVISIT: Skipping inherited ML2 tests to reduce UT run time.
|
||||
@testtools.skip('Skipping test class')
|
||||
class TestMl2BasicGet(test_plugin.TestBasicGet,
|
||||
Ml2PlusPluginV2TestCase):
|
||||
pass
|
||||
|
||||
|
||||
# REVISIT: Skipping inherited ML2 tests to reduce UT run time.
|
||||
@testtools.skip('Skipping test class')
|
||||
class TestMl2V2HTTPResponse(test_plugin.TestV2HTTPResponse,
|
||||
Ml2PlusPluginV2TestCase):
|
||||
pass
|
||||
|
||||
|
||||
# REVISIT: Skipping inherited ML2 tests to reduce UT run time.
|
||||
@testtools.skip('Skipping test class')
|
||||
class TestMl2PortsV2(test_plugin.TestPortsV2,
|
||||
Ml2PlusPluginV2TestCase):
|
||||
pass
|
||||
|
||||
|
||||
# REVISIT: Skipping inherited ML2 tests to reduce UT run time.
|
||||
@testtools.skip('Skipping test class')
|
||||
class TestMl2NetworksV2(test_plugin.TestNetworksV2,
|
||||
Ml2PlusPluginV2TestCase):
|
||||
pass
|
||||
|
||||
|
||||
# REVISIT: Skipping inherited ML2 tests to reduce UT run time.
|
||||
@testtools.skip('Skipping test class')
|
||||
class TestMl2SubnetsV2(test_plugin.TestSubnetsV2,
|
||||
Ml2PlusPluginV2TestCase):
|
||||
pass
|
||||
|
||||
|
||||
# REVISIT: Skipping inherited ML2 tests to reduce UT run time.
|
||||
@testtools.skip('Skipping test class')
|
||||
class TestMl2SubnetPoolsV2(test_plugin.TestSubnetPoolsV2,
|
||||
Ml2PlusPluginV2TestCase):
|
||||
pass
|
||||
|
|
|
|||
|
|
@ -2,17 +2,17 @@
|
|||
# of appearance. Changing the order has an impact on the overall integration
|
||||
# process, which may cause wedges in the gate later.
|
||||
|
||||
-e git+https://git.openstack.org/openstack/neutron.git@stable/newton#egg=neutron
|
||||
-e git+https://git.openstack.org/openstack/neutron.git@newton-eol#egg=neutron
|
||||
|
||||
-e git+https://github.com/noironetworks/apicapi.git@master#egg=apicapi
|
||||
|
||||
-e git+https://github.com/noironetworks/python-opflex-agent.git@stable/newton#egg=python-opflexagent-agent
|
||||
-e git+https://github.com/noironetworks/apic-ml2-driver.git@master#egg=apic_ml2
|
||||
|
||||
-e git+https://git.openstack.org/openstack/python-group-based-policy-client@master#egg=gbpclient
|
||||
-e git+https://git.openstack.org/openstack/neutron-vpnaas@stable/newton#egg=neutron-vpnaas
|
||||
-e git+https://git.openstack.org/openstack/neutron-lbaas@stable/newton#egg=neutron-lbaas
|
||||
-e git+https://git.openstack.org/openstack/neutron-fwaas@stable/newton#egg=neutron-fwaas
|
||||
-e git+https://git.openstack.org/openstack/python-group-based-policy-client@stable/newton#egg=gbpclient
|
||||
-e git+https://git.openstack.org/openstack/neutron-vpnaas@newton-eol#egg=neutron-vpnaas
|
||||
-e git+https://git.openstack.org/openstack/neutron-lbaas@newton-eol#egg=neutron-lbaas
|
||||
-e git+https://git.openstack.org/openstack/neutron-fwaas@newton-eol#egg=neutron-fwaas
|
||||
hacking<0.12,>=0.11.0 # Apache-2.0
|
||||
|
||||
cliff>=1.15.0 # Apache-2.0
|
||||
|
|
|
|||
Loading…
Reference in New Issue