From f600874cef933a2077a51bb334365a861e6fbb48 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Sat, 17 Nov 2018 08:46:02 +0100 Subject: Rename Rally blacklist.txt to blacklist.yaml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It eases editing it or verifyfing it via yamllint. Change-Id: I380830eff5f404745e284067b5a10f58dc60b80e Signed-off-by: Cédric Ollivier --- functest/opnfv_tests/openstack/rally/blacklist.txt | 24 --------------------- .../opnfv_tests/openstack/rally/blacklist.yaml | 25 ++++++++++++++++++++++ functest/opnfv_tests/openstack/rally/rally.py | 2 +- 3 files changed, 26 insertions(+), 25 deletions(-) delete mode 100644 functest/opnfv_tests/openstack/rally/blacklist.txt create mode 100644 functest/opnfv_tests/openstack/rally/blacklist.yaml (limited to 'functest/opnfv_tests/openstack') diff --git a/functest/opnfv_tests/openstack/rally/blacklist.txt b/functest/opnfv_tests/openstack/rally/blacklist.txt deleted file mode 100644 index 1ade43eaf..000000000 --- a/functest/opnfv_tests/openstack/rally/blacklist.txt +++ /dev/null @@ -1,24 +0,0 @@ -scenario: - - - scenarios: - - '^os-' # all scenarios - tests: - # Following test occasionally fails due to race condition issue on - # quota manipulation in nova. - # Ref: https://bugs.launchpad.net/nova/+bug/1552622 - - 'Quotas.nova_update_and_delete' - -functionality: - - - functions: - - no_migration - tests: - - NovaServers.boot_and_live_migrate_server - - NovaServers.boot_server_attach_created_volume_and_live_migrate - - NovaServers.boot_server_from_volume_and_live_migrate - - NovaServers.boot_and_migrate_server - - - functions: - - no_net_trunk_service - tests: - - '^NeutronTrunk' diff --git a/functest/opnfv_tests/openstack/rally/blacklist.yaml b/functest/opnfv_tests/openstack/rally/blacklist.yaml new file mode 100644 index 000000000..4c85088a8 --- /dev/null +++ b/functest/opnfv_tests/openstack/rally/blacklist.yaml @@ -0,0 +1,25 @@ +--- +scenario: + - + scenarios: + - '^os-' # all scenarios + tests: + # Following test occasionally fails due to race condition issue on + # quota manipulation in nova. + # Ref: https://bugs.launchpad.net/nova/+bug/1552622 + - 'Quotas.nova_update_and_delete' + +functionality: + - + functions: + - no_migration + tests: + - NovaServers.boot_and_live_migrate_server + - NovaServers.boot_server_attach_created_volume_and_live_migrate + - NovaServers.boot_server_from_volume_and_live_migrate + - NovaServers.boot_and_migrate_server + - + functions: + - no_net_trunk_service + tests: + - '^NeutronTrunk' diff --git a/functest/opnfv_tests/openstack/rally/rally.py b/functest/opnfv_tests/openstack/rally/rally.py index 1d7d75ff4..594905b26 100644 --- a/functest/opnfv_tests/openstack/rally/rally.py +++ b/functest/opnfv_tests/openstack/rally/rally.py @@ -55,7 +55,7 @@ class RallyBase(singlevm.VmReady2): TENANTS_AMOUNT = 3 ITERATIONS_AMOUNT = 10 CONCURRENCY = 4 - BLACKLIST_FILE = os.path.join(RALLY_DIR, "blacklist.txt") + BLACKLIST_FILE = os.path.join(RALLY_DIR, "blacklist.yaml") TASK_DIR = os.path.join(getattr(config.CONF, 'dir_rally_data'), 'task') TEMP_DIR = os.path.join(TASK_DIR, 'var') -- cgit 1.2.3-korg