From 10df63dcf92d18357639213d8705b2428ca1ca02 Mon Sep 17 00:00:00 2001 From: Alfredo Deza Date: Tue, 29 Nov 2016 15:01:31 -0500 Subject: [PATCH] tests: use underscores to prevent tox combinatorial issues Signed-off-by: Alfredo Deza Resolves: colocated#tests --- tox.ini | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tox.ini b/tox.ini index ae59c364e..b163734c8 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = {ansible2.2}-{xenial-conf-tests,xenial-mon-osd,xenial-cluster,journal-collocation,centos7-cluster,dmcrypt-journal,dmcrypt-journal-collocation} +envlist = {ansible2.2}-{xenial_conf_tests,xenial_mon_osd,xenial_cluster,journal_collocation,centos7_cluster,dmcrypt_journal,dmcrypt_journal_collocation} skipsdist = True [testenv] @@ -17,19 +17,19 @@ deps= -r{toxinidir}/tests/requirements.txt changedir= # test a 3 mon cluster and ensures ceph.conf is rendered correctly - xenial-conf-tests: {toxinidir}/tests/functional/ubuntu/16.04/mon + xenial_conf_tests: {toxinidir}/tests/functional/ubuntu/16.04/mon # tests a 1 mon 1 osd xenial cluster using raw_multi_journal OSD scenario - xenial-mon-osd: {toxinidir}/tests/functional/ubuntu/16.04/mon-osd + xenial_mon_osd: {toxinidir}/tests/functional/ubuntu/16.04/mon-osd # tests a 1 mon, 1 osd, 1 mds and 1 rgw xenial cluster using raw_multi_journal OSD scenario - xenial-cluster: {toxinidir}/tests/functional/ubuntu/16.04/mon-osd-mds-rgw + xenial_cluster: {toxinidir}/tests/functional/ubuntu/16.04/mon-osd-mds-rgw # tests a 1 mon 1 osd centos7 cluster using journal_collocation OSD scenario - journal-collocation: {toxinidir}/tests/functional/centos/7/journal-collocation + journal_collocation: {toxinidir}/tests/functional/centos/7/journal-collocation # tests a 1 mon 1 osd centos7 cluster using dmcrypt_dedicated_journal OSD scenario - dmcrypt-journal: {toxinidir}/tests/functional/centos/7/dmcrypt-dedicated-journal + dmcrypt_journal: {toxinidir}/tests/functional/centos/7/dmcrypt-dedicated-journal # tests a 1 mon 1 osd centos7 cluster using dmcrypt_journal_collocation OSD scenario - dmcrypt-journal-collocation: {toxinidir}/tests/functional/centos/7/dmcrypt-journal-collocation + dmcrypt_journal_collocation: {toxinidir}/tests/functional/centos/7/dmcrypt-journal-collocation # tests a 1 mon, 1 osd, 1 mds and 1 rgw centos7 cluster using raw_multi_journal OSD scenario - centos7-cluster: {toxinidir}/tests/functional/centos/7/mon-osd-mds-rgw + centos7_cluster: {toxinidir}/tests/functional/centos/7/mon-osd-mds-rgw commands= vagrant up --no-provision {posargs:--provider=virtualbox} bash {toxinidir}/tests/scripts/generate_ssh_config.sh {changedir} -- 2.39.5