From bbe8c3e48543eca31493cf33b02e1d9a48de2280 Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=A9dric=20Ollivier?= Date: Sat, 14 Sep 2019 09:44:27 +0200 Subject: [PATCH] Remove any instance quota in tempest_scenario MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The next testcase can reach the default limit if lots of computes available [1]. tempest.scenario.test_server_multinode.TestServerMultinode.test_schedule_to_all_nodes [1] http://artifacts.opnfv.org/functest/functest-opnfv-functest-smoke-hunter-tempest_scenario-run-325/results/tempest_scenario/test_raw_list.txt Change-Id: Ibf68e2a367199afee3f6198ebf683be6cd938d94 Signed-off-by: Cédric Ollivier --- docker/smoke/testcases.yaml | 2 +- functest/ci/testcases.yaml | 2 +- functest/opnfv_tests/openstack/tempest/tempest.py | 12 ++++++++++++ setup.cfg | 1 + 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/docker/smoke/testcases.yaml b/docker/smoke/testcases.yaml index a697dd162..00930a5bc 100644 --- a/docker/smoke/testcases.yaml +++ b/docker/smoke/testcases.yaml @@ -114,7 +114,7 @@ tiers: the OpenStack deployment. https://github.com/openstack/tempest/blob/18.0.0/tox.ini#L84 run: - name: tempest_common + name: tempest_scenario args: mode: '(?!.*\[.*\bslow\b.*\])(^tempest\.scenario)' option: diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml index 307d9842e..6e96efd33 100644 --- a/functest/ci/testcases.yaml +++ b/functest/ci/testcases.yaml @@ -277,7 +277,7 @@ tiers: the OpenStack deployment. https://github.com/openstack/tempest/blob/18.0.0/tox.ini#L84 run: - name: tempest_common + name: tempest_scenario args: mode: '(?!.*\[.*\bslow\b.*\])(^tempest\.scenario)' option: diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py index 9c84cdc82..faf2ab5ca 100644 --- a/functest/opnfv_tests/openstack/tempest/tempest.py +++ b/functest/opnfv_tests/openstack/tempest/tempest.py @@ -638,3 +638,15 @@ class TempestCommon(singlevm.VmReady2): if skips > 0 and self.deny_skipping: return testcase.TestCase.EX_TESTCASE_FAILED return super(TempestCommon, self).is_successful() + + +class TempestScenario(TempestCommon): + """Tempest scenario testcase implementation class.""" + + quota_instances = -1 + + def run(self, **kwargs): + self.orig_cloud.set_compute_quotas( + self.project.project.name, + instances=self.quota_instances) + return super(TempestScenario, self).run(**kwargs) diff --git a/setup.cfg b/setup.cfg index cbab638e9..3e35cfc37 100644 --- a/setup.cfg +++ b/setup.cfg @@ -26,6 +26,7 @@ xtesting.testcase = cinder_test = functest.opnfv_tests.openstack.cinder.cinder_test:CinderCheck odl = functest.opnfv_tests.sdn.odl.odl:ODLTests tempest_common = functest.opnfv_tests.openstack.tempest.tempest:TempestCommon + tempest_scenario = functest.opnfv_tests.openstack.tempest.tempest:TempestScenario rally_sanity = functest.opnfv_tests.openstack.rally.rally:RallySanity refstack = functest.opnfv_tests.openstack.refstack.refstack:Refstack patrole = functest.opnfv_tests.openstack.patrole.patrole:Patrole -- 2.16.6