aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2018-11-17 08:46:02 +0100
committerCédric Ollivier <cedric.ollivier@orange.com>2018-11-17 08:49:09 +0100
commit0e3b125cd07a2c6c538b971044f5f013abf6e5d6 (patch)
treed174a045fd4ba22ce7a7d5d0932c674848bdc72c
parentdd071ebc655801665b14a798757548f6a04f2b05 (diff)
Rename Rally blacklist.txt to blacklist.yaml
It eases editing it or verifyfing it via yamllint. Change-Id: I380830eff5f404745e284067b5a10f58dc60b80e Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit f600874cef933a2077a51bb334365a861e6fbb48)
-rw-r--r--functest/opnfv_tests/openstack/rally/blacklist.yaml (renamed from functest/opnfv_tests/openstack/rally/blacklist.txt)1
-rw-r--r--functest/opnfv_tests/openstack/rally/rally.py2
-rw-r--r--tox.ini1
3 files changed, 3 insertions, 1 deletions
diff --git a/functest/opnfv_tests/openstack/rally/blacklist.txt b/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