From 408597f2314e961e90ca2bb9026c3581eed17e06 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Fri, 30 Nov 2018 11:25:25 +0100 Subject: [PATCH] tests: add purge_lvm_osds_container scenario This commits adds the purge_lvm_osds_container scenario. Signed-off-by: Guillaume Abrioux (cherry picked from commit b04fe72f35a1d857968463b8ac0421e9b0e03872) --- tox.ini | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 1ec55debd..41199aff8 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = {dev,luminous,mimic,rhcs}-{xenial_cluster,centos7_cluster,cluster,docker_cluster,update_cluster,update_docker_cluster,switch_to_containers,ooo_collocation,bluestore_lvm_osds,bluestore_lvm_osds_container,lvm_osds,purge_lvm_osds,shrink_mon,shrink_osd,shrink_mon_container,shrink_osd_container,docker_cluster_collocation,lvm_batch,lvm_osds_container,lvm_batch_container,infra_lv_create,add_osds,add_osds_container,rgw_multisite,rgw_multisite_container} +envlist = {dev,luminous,mimic,rhcs}-{xenial_cluster,centos7_cluster,cluster,docker_cluster,update_cluster,update_docker_cluster,switch_to_containers,ooo_collocation,bluestore_lvm_osds,bluestore_lvm_osds_container,lvm_osds,purge_lvm_osds,purge_lvm_osds_container,shrink_mon,shrink_osd,shrink_mon_container,shrink_osd_container,docker_cluster_collocation,lvm_batch,lvm_osds_container,lvm_batch_container,infra_lv_create,add_osds,add_osds_container,rgw_multisite,rgw_multisite_container} infra_lv_create skipsdist = True @@ -207,6 +207,8 @@ setenv= update_docker_cluster: PLAYBOOK = site-docker.yml.sample purge_cluster_container: PLAYBOOK = site-docker.yml.sample purge_cluster_container: PURGE_PLAYBOOK = purge-docker-cluster.yml + purge_lvm_osds_container: PLAYBOOK = site-docker.yml.sample + purge_lvm_osds_container: PURGE_PLAYBOOK = purge-docker-cluster.yml add_osds: PLAYBOOK = site.yml.sample add_osds_container: PLAYBOOK = site-docker.yml.sample rgw_multisite: PLAYBOOK = site.yml.sample @@ -271,6 +273,7 @@ changedir= bluestore_lvm_osds: {toxinidir}/tests/functional/centos/7/bs-lvm-osds bluestore_lvm_osds_container: {toxinidir}/tests/functional/centos/7/bs-lvm-osds-container purge_lvm_osds: {toxinidir}/tests/functional/centos/7/lvm-osds + purge_lvm_osds_container: {toxinidir}/tests/functional/centos/7/lvm-osds-container ooo_collocation: {toxinidir}/tests/functional/centos/7/ooo-collocation add_osds: {toxinidir}/tests/functional/centos/7/add-osds add_osds_container: {toxinidir}/tests/functional/centos/7/add-osds-container @@ -296,6 +299,7 @@ commands= shrink_osd: ansible-playbook -vv -i {changedir}/hosts {toxinidir}/tests/functional/lvm_setup.yml shrink_osd_container: ansible-playbook -vv -i {changedir}/hosts {toxinidir}/tests/functional/lvm_setup.yml purge_lvm_osds: ansible-playbook -vv -i {changedir}/hosts {toxinidir}/tests/functional/lvm_setup.yml + purge_lvm_osds_container: ansible-playbook -vv -i {changedir}/hosts {toxinidir}/tests/functional/lvm_setup.yml update_docker_cluster: ansible-playbook -vv -i {changedir}/hosts {toxinidir}/tests/functional/lvm_setup.yml update_cluster: ansible-playbook -vv -i {changedir}/hosts {toxinidir}/tests/functional/lvm_setup.yml purge_cluster_non_container: ansible-playbook -vv -i {changedir}/hosts {toxinidir}/tests/functional/lvm_setup.yml @@ -352,6 +356,7 @@ commands= purge_filestore_osds_container: {[purge]commands} purge_bluestore_osds_container: {[purge]commands} purge_lvm_osds: {[purge-lvm]commands} + purge_lvm_osds_container: {[purge-lvm]commands} switch_to_containers: {[switch-to-containers]commands} update_cluster: {[update]commands} update_docker_cluster: {[update]commands} -- 2.39.5