From d15e464b816b6605a84c96d81e4edc18730c6456 Mon Sep 17 00:00:00 2001 From: Andrew Schoen Date: Tue, 6 Jun 2017 09:43:14 -0500 Subject: [PATCH] tests: adds *-update_docker_cluster testing scenarios Signed-off-by: Andrew Schoen --- tox.ini | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index b5f263111..f3942b876 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = {jewel,kraken,rhcs}-{ansible2.2}-{xenial_cluster,journal_collocation,centos7_cluster,dmcrypt_journal,dmcrypt_journal_collocation,docker_cluster,purge_cluster,purge_dmcrypt,docker_dedicated_journal,docker_dmcrypt_journal_collocation,update_dmcrypt,update_cluster,cluster,purge_docker_cluster} +envlist = {jewel,kraken,rhcs}-{ansible2.2}-{xenial_cluster,journal_collocation,centos7_cluster,dmcrypt_journal,dmcrypt_journal_collocation,docker_cluster,purge_cluster,purge_dmcrypt,docker_dedicated_journal,docker_dmcrypt_journal_collocation,update_dmcrypt,update_cluster,cluster,purge_docker_cluster,update_docker_cluster} skipsdist = True # extra commands for purging clusters @@ -39,6 +39,9 @@ commands= ireallymeanit=yes \ ceph_stable_release={env:UPDATE_CEPH_STABLE_RELEASE:kraken} \ fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \ + ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \ + ceph_docker_image={env:UPDATE_CEPH_DOCKER_IMAGE:ceph/daemon} \ + ceph_docker_image_tag={env:UPDATE_CEPH_DOCKER_IMAGE_TAG:latest} \ " testinfra -n 4 --sudo -v --connection=ansible --ansible-inventory={changedir}/hosts {toxinidir}/tests/functional/tests @@ -56,6 +59,7 @@ setenv= # only available for ansible >= 2.2 ANSIBLE_STDOUT_CALLBACK = debug docker_cluster: 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 docker_dedicated_journal: PLAYBOOK = site-docker.yml.sample @@ -85,6 +89,7 @@ changedir= cluster: {toxinidir}/tests/functional/centos/7/cluster # tests a 1 mon, 1 osd, 1 mds and 1 rgw centos7 cluster using docker docker_cluster: {toxinidir}/tests/functional/centos/7/docker-cluster + update_docker_cluster: {toxinidir}/tests/functional/centos/7/docker-cluster purge_docker_cluster: {toxinidir}/tests/functional/centos/7/docker-cluster docker_dedicated_journal: {toxinidir}/tests/functional/centos/7/docker-cluster-dedicated-journal docker_dmcrypt_journal_collocation: {toxinidir}/tests/functional/centos/7/docker-cluster-dmcrypt-journal-collocation @@ -117,5 +122,6 @@ commands= purge_docker_cluster: {[purge]commands} update_dmcrypt: {[update]commands} update_cluster: {[update]commands} + update_docker_cluster: {[update]commands} vagrant destroy --force