diff options
| author |   Juha Kosonen <juha.kosonen@nokia.com> | 2018-08-28 14:49:24 +0300 |
|---|---|---|
| committer | Juha Kosonen <juha.kosonen@nokia.com> | 2018-08-28 14:49:24 +0300 |
| commit | 247535739882f7d9c99b89f349e7fc080d789025 (patch) | |
| tree | b80e6cdf841f8a5740ee3a601ded9a52bec497eb /functest/opnfv_tests/openstack/rally | |
| parent | 3b5a537a6ababd5d6a7157157ae4108ed21075c4 (diff) | |
Remove installer type from rally blacklist
Enables utilization of blacklist also on non-OPNFV environments since
there is no link to installer type.
JIRA: FUNCTEST-1008
Change-Id: I3eb4377af153480794c1a71c5d7ef3e78dacacb9
Signed-off-by: Juha Kosonen <juha.kosonen@nokia.com>
Diffstat (limited to 'functest/opnfv_tests/openstack/rally')
| -rw-r--r-- | functest/opnfv_tests/openstack/rally/blacklist.txt | 2 | ||||
| -rw-r--r-- | functest/opnfv_tests/openstack/rally/rally.py | 7 |
2 files changed, 2 insertions, 7 deletions
diff --git a/functest/opnfv_tests/openstack/rally/blacklist.txt b/functest/opnfv_tests/openstack/rally/blacklist.txt index ce929d733..0900f21c1 100644 --- a/functest/opnfv_tests/openstack/rally/blacklist.txt +++ b/functest/opnfv_tests/openstack/rally/blacklist.txt @@ -2,8 +2,6 @@ scenario: - scenarios: - '^os-' # all scenarios - installers: - - '.+' # all installers tests: # Following test occasionally fails due to race condition issue on # quota manipulation in nova. diff --git a/functest/opnfv_tests/openstack/rally/rally.py b/functest/opnfv_tests/openstack/rally/rally.py index bb67fc270..afaed4c65 100644 --- a/functest/opnfv_tests/openstack/rally/rally.py +++ b/functest/opnfv_tests/openstack/rally/rally.py @@ -188,16 +188,13 @@ class RallyBase(singlevm.VmReady2): with open(RallyBase.BLACKLIST_FILE, 'r') as black_list_file: black_list_yaml = yaml.safe_load(black_list_file) - installer_type = env.get('INSTALLER_TYPE') deploy_scenario = env.get('DEPLOY_SCENARIO') - if (bool(installer_type) and bool(deploy_scenario) and + if (bool(deploy_scenario) and 'scenario' in black_list_yaml.keys()): for item in black_list_yaml['scenario']: scenarios = item['scenarios'] - installers = item['installers'] in_it = RallyBase.in_iterable_re - if (in_it(deploy_scenario, scenarios) and - in_it(installer_type, installers)): + if in_it(deploy_scenario, scenarios): tests = item['tests'] black_tests.extend(tests) except Exception: # pylint: disable=broad-except |