diff options
| author |   Jose Lausuch <jose.lausuch@ericsson.com> | 2017-02-16 08:24:58 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-02-16 08:24:59 +0000 |
| commit | 6c8b09ca1184139a784a7d6c42e0ca09fa57dca9 (patch) | |
| tree | 0b916fd48ed24f460e5ade58d115cf2b6a9153ca /functest/opnfv_tests/openstack/tempest/tempest.py | |
| parent | 93fe04c15c86fff32a118eb52350d528ed72b475 (diff) | |
| parent | bc4c0c3cc4beea6b86a5f06663323c654385a04e (diff) | |
Merge "Fix tempest multisite config"
Diffstat (limited to 'functest/opnfv_tests/openstack/tempest/tempest.py')
| -rw-r--r-- | functest/opnfv_tests/openstack/tempest/tempest.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py index 13d9e4e6..f925336d 100644 --- a/functest/opnfv_tests/openstack/tempest/tempest.py +++ b/functest/opnfv_tests/openstack/tempest/tempest.py @@ -113,7 +113,7 @@ class TempestCommon(testcase_base.TestcaseBase): if self.MODE == 'smoke': testr_mode = "smoke" elif self.MODE == 'feature_multisite': - testr_mode = " | grep -i kingbird " + testr_mode = "'[Kk]ingbird'" elif self.MODE == 'full': testr_mode = "" else: @@ -272,7 +272,8 @@ class TempestCommon(testcase_base.TestcaseBase): self.create_tempest_resources() conf_utils.configure_tempest(self.DEPLOYMENT_DIR, self.IMAGE_ID, - self.FLAVOR_ID) + self.FLAVOR_ID, + self.MODE) self.generate_test_list(self.VERIFIER_REPO_DIR) self.apply_tempest_blacklist() self.run_verifier_tests() @@ -319,7 +320,6 @@ class TempestMultisite(TempestCommon): self.case_name = "multisite" self.MODE = "feature_multisite" self.OPTION = "--concurrency 1" - conf_utils.configure_tempest_multisite(self.DEPLOYMENT_DIR) class TempestCustom(TempestCommon): |