tests: use underscores to prevent tox combinatorial issues

Signed-off-by: Alfredo Deza <adeza@redhat.com>

Resolves: colocated#tests
pull/1130/head
Alfredo Deza 2016-11-29 15:01:31 -05:00
parent d0b2b13f4f
commit 10df63dcf9
1 changed files with 8 additions and 8 deletions

16
tox.ini
View File

@ -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}