From 655ac5eb93888f9de11d910c04c644703a5bf705 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Mon, 1 Apr 2019 17:22:50 +0200 Subject: [PATCH] tests: test idempotency only on all_daemons job there's no need to test this on all scenarios. testing idempotency on all_daemons should be enough and allow us to save precious resources for the CI. Signed-off-by: Guillaume Abrioux (cherry picked from commit 136bfe096c5e97c5c983d02882919d4af2af48a6) --- tox.ini | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/tox.ini b/tox.ini index 23f3ff7bc..326ee1439 100644 --- a/tox.ini +++ b/tox.ini @@ -291,28 +291,19 @@ commands= " # wait 30sec for services to be ready - sleep 30 + all_daemons: sleep 30 # test cluster state using ceph-ansible tests - py.test -n 8 --durations=0 --sudo -v --connection=ansible --ansible-inventory={changedir}/{env:INVENTORY} {toxinidir}/tests/functional/tests + all_daemons: py.test -n 8 --durations=0 --sudo -v --connection=ansible --ansible-inventory={changedir}/{env:INVENTORY} {toxinidir}/tests/functional/tests # reboot all vms - ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/reboot.yml + all_daemons: ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/reboot.yml # wait 30sec for services to be ready # retest to ensure cluster came back up correctly after rebooting - py.test -n 8 --durations=0 --sudo -v --connection=ansible --ansible-inventory={changedir}/{env:INVENTORY} {toxinidir}/tests/functional/tests + all_daemons: py.test -n 8 --durations=0 --sudo -v --connection=ansible --ansible-inventory={changedir}/{env:INVENTORY} {toxinidir}/tests/functional/tests # handlers/idempotency test - 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:nautilus} \ - 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_BIS:latest-bis-master} # not ideal but what can we do? \ - copy_admin_key={env:COPY_ADMIN_KEY:False} " \ - --extra-vars @ceph-override.json + all_daemons: 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:nautilus} 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_BIS:latest-bis-master} copy_admin_key={env:COPY_ADMIN_KEY:False} " --extra-vars @ceph-override.json purge: {[purge]commands} switch_to_containers: {[switch-to-containers]commands}