update sources to v12.2.3

[ceph.git] / ceph / src / ceph-volume / ceph_volume / tests / functional / simple / tox.ini

diff --git a/ceph/src/ceph-volume/ceph_volume/tests/functional/simple/tox.ini b/ceph/src/ceph-volume/ceph_volume/tests/functional/simple/tox.ini
index 0d2e68adcf4446fe64bc30b6f65c5ffc75e23a10..6d48c35b3b633e6908a0a7263346e1f40921ec21 100644 (file)
--- a/ceph/src/ceph-volume/ceph_volume/tests/functional/simple/tox.ini
+++ b/ceph/src/ceph-volume/ceph_volume/tests/functional/simple/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = {centos7,xenial}-{filestore,bluestore}-{activate}
+envlist = {centos7,xenial}-{filestore,bluestore}-{activate,dmcrypt_plain,dmcrypt_luks}
 skipsdist = True
 
 [testenv]
@@ -7,6 +7,7 @@ whitelist_externals =
     vagrant
     bash
     git
+    sleep
 passenv=*
 setenv=
   ANSIBLE_SSH_ARGS = -F {changedir}/vagrant_ssh_config
@@ -23,6 +24,14 @@ changedir=
   centos7-bluestore-activate: {toxinidir}/centos7/bluestore/activate
   xenial-filestore-activate: {toxinidir}/xenial/filestore/activate
   xenial-bluestore-activate: {toxinidir}/xenial/bluestore/activate
+  xenial-bluestore-dmcrypt_plain: {toxinidir}/xenial/bluestore/dmcrypt-plain
+  xenial-bluestore-dmcrypt_luks: {toxinidir}/xenial/bluestore/dmcrypt-luks
+  xenial-filestore-dmcrypt_plain: {toxinidir}/xenial/filestore/dmcrypt-plain
+  xenial-filestore-dmcrypt_luks: {toxinidir}/xenial/filestore/dmcrypt-luks
+  centos7-bluestore-dmcrypt_plain: {toxinidir}/centos7/bluestore/dmcrypt-plain
+  centos7-bluestore-dmcrypt_luks: {toxinidir}/centos7/bluestore/dmcrypt-luks
+  centos7-filestore-dmcrypt_plain: {toxinidir}/centos7/filestore/dmcrypt-plain
+  centos7-filestore-dmcrypt_luks: {toxinidir}/centos7/filestore/dmcrypt-luks
 commands=
   git clone -b {env:CEPH_ANSIBLE_BRANCH:master} --single-branch https://github.com/ceph/ceph-ansible.git {envdir}/tmp/ceph-ansible
 
@@ -44,6 +53,9 @@ commands=
   # reboot all vms
   vagrant reload --no-provision
 
+  # wait 2 minutes for services to be ready
+  sleep 120
+
   # retest to ensure cluster came back up correctly after rebooting
   testinfra -n 4 --sudo -v --connection=ansible --ansible-inventory={changedir}/hosts {envdir}/tmp/ceph-ansible/tests/functional/tests