tests: split purge_cluster, followup on a53aa9e

- split purge_cluster because we need to test filestore and bluestore
scenarios.
- clean some leftover.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit 280de30484c3bd02d824074e67a6eeedf1e720e6)

diff --git a/tox.ini b/tox.ini
index 4bcb31f51aeada9d690da5c4f2217f1ac79b4a68..71cf51737f4fc34b635a0f19b6564af51dddaf2d 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -128,8 +128,13 @@ setenv=
   docker_cluster: PLAYBOOK = site-docker.yml.sample
   docker_cluster_collocation: PLAYBOOK = site-docker.yml.sample
   update_docker_cluster: PLAYBOOK = site-docker.yml.sample
-  purge_docker_cluster: PLAYBOOK = site-docker.yml.sample
-  purge_docker_cluster: PURGE_PLAYBOOK = purge-docker-cluster.yml
+  purge_cluster_container: PLAYBOOK = site-docker.yml.sample
+  purge_cluster_container: PURGE_PLAYBOOK = purge-docker-cluster.yml
+  purge_bluestore_osds_container: PLAYBOOK = site-docker.yml.sample
+  purge_bluestore_osds_container: PURGE_PLAYBOOK = purge-docker-cluster.yml
+  purge_filestore_osds_container: PLAYBOOK = site-docker.yml.sample
+  purge_filestore_osds_container: PURGE_PLAYBOOK = purge-docker-cluster.yml
+
   filestore_osds_container: PLAYBOOK = site-docker.yml.sample
   bluestore_osds_container: PLAYBOOK = site-docker.yml.sample
   shrink_mon_container: PLAYBOOK = site-docker.yml.sample
@@ -171,9 +176,12 @@ changedir=
   docker_cluster: {toxinidir}/tests/functional/centos/7/docker
   docker_cluster_collocation: {toxinidir}/tests/functional/centos/7/docker-collocation
   update_docker_cluster: {toxinidir}/tests/functional/centos/7/docker
-  purge_docker_cluster: {toxinidir}/tests/functional/centos/7/docker
-  purge_cluster: {toxinidir}/tests/functional/centos/7/bs-osds-non-container
-  update_dmcrypt: {toxinidir}/tests/functional/centos/7/bs-osds-non-container
+  purge_filestore_osds_container: {toxinidir}/tests/functional/centos/7/fs-osds-container
+  purge_bluestore_osds_container: {toxinidir}/tests/functional/centos/7/bs-osds-container
+  purge_filestore_osds_non_container: {toxinidir}/tests/functional/centos/7/fs-osds-non-container
+  purge_bluestore_osds_non_container: {toxinidir}/tests/functional/centos/7/bs-osds-non-container
+  purge_cluster_non_container: {toxinidir}/tests/functional/centos/7/cluster
+  purge_cluster_container: {toxinidir}/tests/functional/centos/7/docker
   update_cluster: {toxinidir}/tests/functional/centos/7/cluster
   switch_to_containers: {toxinidir}/tests/functional/centos/7/cluster
   lvm_osds: {toxinidir}/tests/functional/centos/7/lvm-osds
@@ -228,12 +236,14 @@ commands=
       ceph_dev_sha1={env:CEPH_DEV_SHA1:latest} " \
       --extra-vars @ceph-override.json
 
-  purge_cluster: {[purge]commands}
+  purge_cluster_non_container: {[purge]commands}
+  purge_cluster_container: {[purge]commands}
+  purge_filestore_osds_non_container: {[purge]commands}
+  purge_bluestore_osds_non_container: {[purge]commands}
+  purge_filestore_osds_container: {[purge]commands}
+  purge_bluestore_osds_container: {[purge]commands}
   purge_lvm_osds: {[purge-lvm]commands}
-  purge_dmcrypt: {[purge]commands}
-  purge_docker_cluster: {[purge]commands}
   switch_to_containers: {[switch-to-containers]commands}
-  update_dmcrypt: {[update]commands}
   update_cluster: {[update]commands}
   update_docker_cluster: {[update]commands}
   shrink_mon: {[shrink-mon]commands}