From: Andrew Schoen <aschoen@redhat.com>
Date: Tue, 6 Feb 2018 16:46:44 +0000 (-0600)
Subject: ceph-volume: sleep 2 minutes after reboot in simple tests
X-Git-Tag: v12.2.3~19^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c1eb7b9915a61d93a5b09ff588a5906e35a2b208;p=ceph.git

ceph-volume: sleep 2 minutes after reboot in simple tests

This will allow for some time for OSD services to start back up after
reboot. If not we see race conditions where tests fail because they
were run before the OSD finished startup.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit 85b319a2c577c1fa86c6ccbbac61f015dd24ad21)
---

diff --git a/src/ceph-volume/ceph_volume/tests/functional/simple/tox.ini b/src/ceph-volume/ceph_volume/tests/functional/simple/tox.ini
index 25ecbd6316c7..6d48c35b3b63 100644
--- a/src/ceph-volume/ceph_volume/tests/functional/simple/tox.ini
+++ b/src/ceph-volume/ceph_volume/tests/functional/simple/tox.ini
@@ -7,6 +7,7 @@ whitelist_externals =
     vagrant
     bash
     git
+    sleep
 passenv=*
 setenv=
   ANSIBLE_SSH_ARGS = -F {changedir}/vagrant_ssh_config
@@ -52,6 +53,9 @@ commands=
   # reboot all vms
   vagrant reload --no-provision
 
+  # wait 2 minutes for services to be ready
+  sleep 120
+
   # retest to ensure cluster came back up correctly after rebooting
   testinfra -n 4 --sudo -v --connection=ansible --ansible-inventory={changedir}/hosts {envdir}/tmp/ceph-ansible/tests/functional/tests