ceph-volume tests/functional add mixed-type scenarios to tox.ini

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 0d5b90bb1fbf30c6e33dbf7e10a3d0ba053297ae)

diff --git a/src/ceph-volume/ceph_volume/tests/functional/batch/tox.ini b/src/ceph-volume/ceph_volume/tests/functional/batch/tox.ini
index 6a43a110e47eb540e13ffddcdf5243a0fea79907..4185657c5a0cf1c02005c9f3344777df9a411da1 100644 (file)
--- a/src/ceph-volume/ceph_volume/tests/functional/batch/tox.ini
+++ b/src/ceph-volume/ceph_volume/tests/functional/batch/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = {centos7,xenial}-{bluestore,filestore}-{single_type,single_type_dmcrypt}
+envlist = {centos7,xenial}-{bluestore,filestore}-{single_type,single_type_dmcrypt},centos7-{bluestore,filestore}-{mixed_type, mixed_type_dmcrypt}
 skipsdist = True
 
 [testenv]
@@ -25,8 +25,12 @@ deps=
 changedir=
   centos7-filestore-single_type: {toxinidir}/centos7/filestore/single-type
   centos7-filestore-single_type_dmcrypt: {toxinidir}/centos7/filestore/single-type-dmcrypt
+  centos7-filestore-mixed_type: {toxinidir}/centos7/filestore/mixed-type
+  centos7-filestore-mixed_type_dmcrypt: {toxinidir}/centos7/filestore/mixed-type-dmcrypt
   centos7-bluestore-single_type: {toxinidir}/centos7/bluestore/single-type
   centos7-bluestore-single_type_dmcrypt: {toxinidir}/centos7/bluestore/single-type-dmcrypt
+  centos7-bluestore-mixed_type: {toxinidir}/centos7/bluestore/mixed-type
+  centos7-bluestore-mixed_type_dmcrypt: {toxinidir}/centos7/bluestore/mixed-type-dmcrypt
   xenial-filestore-single_type: {toxinidir}/xenial/filestore/single-type
   xenial-filestore-single_type_dmcrypt: {toxinidir}/xenial/filestore/single-type-dmcrypt
   xenial-bluestore-single_type: {toxinidir}/xenial/bluestore/single-type
@@ -39,6 +43,9 @@ commands=
 
   cp {toxinidir}/../playbooks/deploy.yml {envdir}/tmp/ceph-ansible
 
+  # individual scenario setup
+  ansible-playbook -vv -i {changedir}/hosts {changedir}/setup.yml
+
   # use ceph-ansible to deploy a ceph cluster on the vms
   ansible-playbook -vv -i {changedir}/hosts {envdir}/tmp/ceph-ansible/deploy.yml --extra-vars "fetch_directory={changedir}/fetch ceph_dev_branch={env:CEPH_DEV_BRANCH:master} ceph_dev_sha1={env:CEPH_DEV_SHA1:latest} toxinidir={toxinidir}"