From 5db74194b2fadc63f20cf7ae4bcf80977b64b34a Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Wed, 23 Sep 2020 17:58:39 +0200 Subject: [PATCH] tests: reboot and test idempotency on collocation test reboot and idempotency on collocation scenario. Signed-off-by: Guillaume Abrioux (cherry picked from commit f83f798206566b714adbc55e2543cbd9529897fa) --- tests/functional/all_daemons/ceph-override.json | 3 ++- tox.ini | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/functional/all_daemons/ceph-override.json b/tests/functional/all_daemons/ceph-override.json index 45b050d3b..4aebdaece 100644 --- a/tests/functional/all_daemons/ceph-override.json +++ b/tests/functional/all_daemons/ceph-override.json @@ -33,5 +33,6 @@ "min_size": 0 } ], - "ceph_mon_docker_memory_limit": "2g" + "ceph_mon_docker_memory_limit": "2g", + "radosgw_num_instances": 2 } diff --git a/tox.ini b/tox.ini index 2532ea480..5176ac835 100644 --- a/tox.ini +++ b/tox.ini @@ -408,15 +408,15 @@ commands= py.test --reruns 5 --reruns-delay 1 -n 8 --durations=0 --sudo -v --connection=ansible --ansible-inventory={changedir}/{env:INVENTORY} --ssh-config={changedir}/vagrant_ssh_config {toxinidir}/tests/functional/tests # reboot all vms - all_daemons: ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/reboot.yml + all_daemons,collocation: ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/reboot.yml # wait 30sec for services to be ready sleep 30 # retest to ensure cluster came back up correctly after rebooting - all_daemons: py.test --reruns 5 --reruns-delay 1 -n 8 --durations=0 --sudo -v --connection=ansible --ansible-inventory={changedir}/{env:INVENTORY} --ssh-config={changedir}/vagrant_ssh_config {toxinidir}/tests/functional/tests + all_daemons,collocation: py.test --reruns 5 --reruns-delay 1 -n 8 --durations=0 --sudo -v --connection=ansible --ansible-inventory={changedir}/{env:INVENTORY} --ssh-config={changedir}/vagrant_ssh_config {toxinidir}/tests/functional/tests # handlers/idempotency test - all_daemons,all_in_one: ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "delegate_facts_host={env:DELEGATE_FACTS_HOST:True} fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} ceph_stable_release={env:CEPH_STABLE_RELEASE:octopus} ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG_BIS:latest-bis-octopus}" --extra-vars @ceph-override.json + all_daemons,all_in_one,collocation: ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "delegate_facts_host={env:DELEGATE_FACTS_HOST:True} fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} ceph_stable_release={env:CEPH_STABLE_RELEASE:octopus} ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG_BIS:latest-bis-octopus}" --extra-vars @ceph-override.json purge: {[purge]commands} switch_to_containers: {[switch-to-containers]commands} -- 2.39.5