From: Sébastien Han Date: Mon, 2 Oct 2017 20:46:28 +0000 (+0200) Subject: test: add handler support X-Git-Tag: v3.0.0rc15~3^2~2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=18e2ab4d07f0f8e3ee45ee322bc68cf9e2853eef;p=ceph-ansible.git test: add handler support Add idempotency and handler test. Signed-off-by: Sébastien Han --- diff --git a/tests/functional/centos/7/bluestore/ceph-override.json b/tests/functional/centos/7/bluestore/ceph-override.json new file mode 120000 index 000000000..775cb006a --- /dev/null +++ b/tests/functional/centos/7/bluestore/ceph-override.json @@ -0,0 +1 @@ +../cluster/ceph-override.json \ No newline at end of file diff --git a/tests/functional/centos/7/bs-crypt-ded-jrn/ceph-override.json b/tests/functional/centos/7/bs-crypt-ded-jrn/ceph-override.json new file mode 120000 index 000000000..775cb006a --- /dev/null +++ b/tests/functional/centos/7/bs-crypt-ded-jrn/ceph-override.json @@ -0,0 +1 @@ +../cluster/ceph-override.json \ No newline at end of file diff --git a/tests/functional/centos/7/bs-crypt-jrn-col/ceph-override.json b/tests/functional/centos/7/bs-crypt-jrn-col/ceph-override.json new file mode 120000 index 000000000..775cb006a --- /dev/null +++ b/tests/functional/centos/7/bs-crypt-jrn-col/ceph-override.json @@ -0,0 +1 @@ +../cluster/ceph-override.json \ No newline at end of file diff --git a/tests/functional/centos/7/bs-dock-crypt-jrn-col/ceph-override.json b/tests/functional/centos/7/bs-dock-crypt-jrn-col/ceph-override.json new file mode 120000 index 000000000..775cb006a --- /dev/null +++ b/tests/functional/centos/7/bs-dock-crypt-jrn-col/ceph-override.json @@ -0,0 +1 @@ +../cluster/ceph-override.json \ No newline at end of file diff --git a/tests/functional/centos/7/bs-dock-ded-jrn/ceph-override.json b/tests/functional/centos/7/bs-dock-ded-jrn/ceph-override.json new file mode 120000 index 000000000..775cb006a --- /dev/null +++ b/tests/functional/centos/7/bs-dock-ded-jrn/ceph-override.json @@ -0,0 +1 @@ +../cluster/ceph-override.json \ No newline at end of file diff --git a/tests/functional/centos/7/bs-jrn-col/ceph-override.json b/tests/functional/centos/7/bs-jrn-col/ceph-override.json new file mode 120000 index 000000000..775cb006a --- /dev/null +++ b/tests/functional/centos/7/bs-jrn-col/ceph-override.json @@ -0,0 +1 @@ +../cluster/ceph-override.json \ No newline at end of file diff --git a/tests/functional/centos/7/cluster/ceph-override.json b/tests/functional/centos/7/cluster/ceph-override.json new file mode 100644 index 000000000..9a3af9436 --- /dev/null +++ b/tests/functional/centos/7/cluster/ceph-override.json @@ -0,0 +1,7 @@ +{ + "ceph_conf_overrides": { + "global": { + "osd_pool_default_pg_num": 12 + } + } +} diff --git a/tests/functional/centos/7/crypt-ded-jrn/ceph-override.json b/tests/functional/centos/7/crypt-ded-jrn/ceph-override.json new file mode 120000 index 000000000..775cb006a --- /dev/null +++ b/tests/functional/centos/7/crypt-ded-jrn/ceph-override.json @@ -0,0 +1 @@ +../cluster/ceph-override.json \ No newline at end of file diff --git a/tests/functional/centos/7/crypt-jrn-col/ceph-override.json b/tests/functional/centos/7/crypt-jrn-col/ceph-override.json new file mode 120000 index 000000000..775cb006a --- /dev/null +++ b/tests/functional/centos/7/crypt-jrn-col/ceph-override.json @@ -0,0 +1 @@ +../cluster/ceph-override.json \ No newline at end of file diff --git a/tests/functional/centos/7/docker-crypt-jrn-col/ceph-override.json b/tests/functional/centos/7/docker-crypt-jrn-col/ceph-override.json new file mode 120000 index 000000000..775cb006a --- /dev/null +++ b/tests/functional/centos/7/docker-crypt-jrn-col/ceph-override.json @@ -0,0 +1 @@ +../cluster/ceph-override.json \ No newline at end of file diff --git a/tests/functional/centos/7/docker-ded-jrn/ceph-override.json b/tests/functional/centos/7/docker-ded-jrn/ceph-override.json new file mode 120000 index 000000000..775cb006a --- /dev/null +++ b/tests/functional/centos/7/docker-ded-jrn/ceph-override.json @@ -0,0 +1 @@ +../cluster/ceph-override.json \ No newline at end of file diff --git a/tests/functional/centos/7/docker/ceph-override.json b/tests/functional/centos/7/docker/ceph-override.json new file mode 120000 index 000000000..775cb006a --- /dev/null +++ b/tests/functional/centos/7/docker/ceph-override.json @@ -0,0 +1 @@ +../cluster/ceph-override.json \ No newline at end of file diff --git a/tests/functional/centos/7/jrn-col-auto-dm/ceph-override.json b/tests/functional/centos/7/jrn-col-auto-dm/ceph-override.json new file mode 120000 index 000000000..775cb006a --- /dev/null +++ b/tests/functional/centos/7/jrn-col-auto-dm/ceph-override.json @@ -0,0 +1 @@ +../cluster/ceph-override.json \ No newline at end of file diff --git a/tests/functional/centos/7/jrn-col-auto/ceph-override.json b/tests/functional/centos/7/jrn-col-auto/ceph-override.json new file mode 120000 index 000000000..775cb006a --- /dev/null +++ b/tests/functional/centos/7/jrn-col-auto/ceph-override.json @@ -0,0 +1 @@ +../cluster/ceph-override.json \ No newline at end of file diff --git a/tests/functional/centos/7/jrn-col/ceph-override.json b/tests/functional/centos/7/jrn-col/ceph-override.json new file mode 120000 index 000000000..775cb006a --- /dev/null +++ b/tests/functional/centos/7/jrn-col/ceph-override.json @@ -0,0 +1 @@ +../cluster/ceph-override.json \ No newline at end of file diff --git a/tests/functional/centos/7/lvm-osds/ceph-override.json b/tests/functional/centos/7/lvm-osds/ceph-override.json new file mode 120000 index 000000000..775cb006a --- /dev/null +++ b/tests/functional/centos/7/lvm-osds/ceph-override.json @@ -0,0 +1 @@ +../cluster/ceph-override.json \ No newline at end of file diff --git a/tox.ini b/tox.ini index 53be8a1e8..80020236e 100644 --- a/tox.ini +++ b/tox.ini @@ -228,6 +228,18 @@ commands= # retest to ensure cluster came back up correctly after rebooting testinfra -n 4 --sudo -v --connection=ansible --ansible-inventory={changedir}/hosts {toxinidir}/tests/functional/tests + # handlers/idempotency test + ansible-playbook -vv -i {changedir}/hosts {toxinidir}/{env:PLAYBOOK:site.yml.sample} \ + --extra-vars "\ + fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \ + ceph_stable_release={env:CEPH_STABLE_RELEASE:luminous} \ + ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \ + ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \ + ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest} \ + ceph_dev_branch={env:CEPH_DEV_BRANCH:master} \ + ceph_dev_sha1={env:CEPH_DEV_SHA1:latest} " \ + --extra-vars @ceph-override.json + purge_cluster: {[purge]commands} purge_lvm_osds: {[purge-lvm]commands} purge_dmcrypt: {[purge]commands}