aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2019-09-14 09:44:27 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2019-09-14 09:55:56 +0200
commit64efb5d6a2a721aa308b29d6de10b1db97e689e2 (patch)
treea2d9da25d42ff10ed5c25760159abb1c58ca244b
parentfd1ec71146ed7c0ec415374ab47e83b631f3c444 (diff)
Remove any instance quota in tempest_scenario
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 <cedric.ollivier@orange.com> (cherry picked from commit bbe8c3e48543eca31493cf33b02e1d9a48de2280)
-rw-r--r--docker/smoke/testcases.yaml2
-rw-r--r--functest/ci/testcases.yaml2
-rw-r--r--functest/opnfv_tests/openstack/tempest/tempest.py12
-rw-r--r--setup.cfg1
4 files changed, 15 insertions, 2 deletions
diff --git a/docker/smoke/testcases.yaml b/docker/smoke/testcases.yaml
index 5b6454ca4..4fa5aaeae 100644
--- a/docker/smoke/testcases.yaml
+++ b/docker/smoke/testcases.yaml
@@ -80,7 +80,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 6a8be8b64..5cb5a56fd 100644
--- a/functest/ci/testcases.yaml
+++ b/functest/ci/testcases.yaml
@@ -243,7 +243,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 4c63e20aa..7a7c41d61 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_defcore = functest.opnfv_tests.openstack.refstack.refstack:Refstack
patrole = functest.opnfv_tests.openstack.patrole.patrole:Patrole