From 0e3b125cd07a2c6c538b971044f5f013abf6e5d6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=A9dric=20Ollivier?= Date: Sat, 17 Nov 2018 08:46:02 +0100 Subject: [PATCH] Rename Rally blacklist.txt to blacklist.yaml MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit It eases editing it or verifyfing it via yamllint. Change-Id: I380830eff5f404745e284067b5a10f58dc60b80e Signed-off-by: Cédric Ollivier (cherry picked from commit f600874cef933a2077a51bb334365a861e6fbb48) --- functest/opnfv_tests/openstack/rally/{blacklist.txt => blacklist.yaml} | 1 + functest/opnfv_tests/openstack/rally/rally.py | 2 +- tox.ini | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) rename functest/opnfv_tests/openstack/rally/{blacklist.txt => blacklist.yaml} (99%) diff --git a/functest/opnfv_tests/openstack/rally/blacklist.txt b/functest/opnfv_tests/openstack/rally/blacklist.yaml similarity index 99% rename from functest/opnfv_tests/openstack/rally/blacklist.txt rename to functest/opnfv_tests/openstack/rally/blacklist.yaml index 1ade43eaf..4c85088a8 100644 --- a/functest/opnfv_tests/openstack/rally/blacklist.txt +++ b/functest/opnfv_tests/openstack/rally/blacklist.yaml @@ -1,3 +1,4 @@ +--- scenario: - scenarios: 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') diff --git a/tox.ini b/tox.ini index 719efafce..c411754d4 100644 --- a/tox.ini +++ b/tox.ini @@ -80,6 +80,7 @@ files = ci docker functest/ci + functest/opnfv_tests/openstack/rally/blacklist.yaml functest/opnfv_tests/openstack/rally/rally_jobs.yaml functest/opnfv_tests/openstack/tempest/custom_tests/blacklist.yaml functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml -- 2.16.6