ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tests: remove sleep commands from tox ini files 

Since we use the rerun plugin in tox, we shouldn't need to add these
`sleep` commands.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
pull/5739/head
Guillaume Abrioux 2020-09-30 17:59:39 +02:00 committed by Dimitri Savineau
parent 8b1eeef18a
commit e835c77a0e
5 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tox-cephadm.ini
View File

@ -8,7 +8,6 @@ whitelist_externals =
vagrant vagrant
bash bash
pip pip
sleep
rm rm
passenv=* passenv=*
sitepackages=True sitepackages=True

1
tox-docker2podman.ini
View File

@ -8,7 +8,6 @@ whitelist_externals =
vagrant vagrant
bash bash
pip pip
sleep
rm rm
passenv=* passenv=*
sitepackages=True sitepackages=True

5
tox-podman.ini
View File

@ -8,7 +8,6 @@ whitelist_externals =
vagrant vagrant
bash bash
pip pip
sleep
rm rm
passenv=* passenv=*
sitepackages=True sitepackages=True
@ -49,16 +48,12 @@ commands=
ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \ ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \
" "
# wait 30sec for services to be ready
sleep 30
# test cluster state using ceph-ansible tests # test cluster state using ceph-ansible tests
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 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
# wait 30sec for services to be ready
# reboot all vms # reboot all vms
ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/reboot.yml 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 # retest to ensure cluster came back up correctly after rebooting
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 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

3
tox-shrink_osd.ini
View File

@ -48,7 +48,6 @@ commands=
whitelist_externals = whitelist_externals =
vagrant vagrant
bash bash
sleep
passenv=* passenv=*
sitepackages=False sitepackages=False
setenv= setenv=
@ -102,8 +101,6 @@ commands=
ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \ ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \
" "
# wait 30sec for services to be ready
sleep 30
# test cluster state using ceph-ansible tests # test cluster state using ceph-ansible tests
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 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

5
tox.ini
View File

@ -277,7 +277,6 @@ whitelist_externals =
vagrant vagrant
bash bash
pip pip
sleep
rm rm
passenv=* passenv=*
sitepackages=False sitepackages=False
@ -366,16 +365,12 @@ commands=
ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \ ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \
" "
# wait 30sec for services to be ready
sleep 30
# test cluster state using ceph-ansible tests # test cluster state using ceph-ansible tests
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 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 # reboot all vms
all_daemons: 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
all_daemons,all_in_one: sleep 30
# retest to ensure cluster came back up correctly after rebooting # 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: 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