diff options
Diffstat (limited to 'functest')
-rw-r--r-- | functest/ci/testcases.yaml | 18 | ||||
-rw-r--r-- | functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml | 2 | ||||
-rw-r--r-- | functest/opnfv_tests/openstack/tempest/tempest.py | 9 |
3 files changed, 24 insertions, 5 deletions
diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml index c8f1a65dc..6a133dda1 100644 --- a/functest/ci/testcases.yaml +++ b/functest/ci/testcases.yaml @@ -396,6 +396,24 @@ tiers: services: - barbican + - + case_name: octavia + project_name: functest + criteria: 100 + blocking: false + description: >- + It leverages on the tempest plugin containing tests used to + verify the functionality of an octavia installation. + run: + name: tempest_common + args: + mode: + '^octavia_tempest_plugin.tests.api.v2' + services: + - octavia + option: + - '--concurrency=2' + - name: benchmarking order: 2 diff --git a/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml b/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml index 06c77efd9..ff67bf015 100644 --- a/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml +++ b/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml @@ -24,3 +24,5 @@ volume: storage_protocol: iSCSI volume-feature-enabled: backup: true +load_balancer: + test_with_noop: true diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py index be86cee86..9c84cdc82 100644 --- a/functest/opnfv_tests/openstack/tempest/tempest.py +++ b/functest/opnfv_tests/openstack/tempest/tempest.py @@ -368,18 +368,17 @@ class TempestCommon(singlevm.VmReady2): black_list_file.close() for item in black_list_yaml: scenarios = item['scenarios'] - if deploy_scenario in scenarios: + in_it = rally.RallyBase.in_iterable_re + if in_it(deploy_scenario, scenarios): tests = item['tests'] - for test in tests: - black_tests.append(test) - break + black_tests.extend(tests) except Exception: # pylint: disable=broad-except black_tests = [] LOGGER.debug("Tempest blacklist file does not exist.") for cases_line in cases_file: for black_tests_line in black_tests: - if black_tests_line in cases_line: + if re.search(black_tests_line, cases_line): break else: result_file.write(str(cases_line) + '\n') |