From: Sage Weil <sage@newdream.net>
Date: Tue, 13 Apr 2021 16:53:24 +0000 (-0400)
Subject: qa/suites/rados/cephadm/smoke-*: use cephadm.wait_for_service
X-Git-Tag: v17.1.0~2221^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=16b30f2858aa8edb42cff79c4d40b40ec5ae72cc;p=ceph.git

qa/suites/rados/cephadm/smoke-*: use cephadm.wait_for_service

Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/qa/suites/rados/cephadm/smoke-roleless/2-services/iscsi.yaml b/qa/suites/rados/cephadm/smoke-roleless/2-services/iscsi.yaml
index f6c5c369af44..7f57076dbe2b 100644
--- a/qa/suites/rados/cephadm/smoke-roleless/2-services/iscsi.yaml
+++ b/qa/suites/rados/cephadm/smoke-roleless/2-services/iscsi.yaml
@@ -4,4 +4,5 @@ tasks:
       - ceph osd pool create foo
       - rbd pool init foo
       - ceph orch apply iscsi foo u p
-      - sleep 120
+- cephadm.wait_for_service:
+    service: iscsi.foo
diff --git a/qa/suites/rados/cephadm/smoke-roleless/2-services/mirror.yaml b/qa/suites/rados/cephadm/smoke-roleless/2-services/mirror.yaml
index 26c656c46778..681e1e04ac78 100644
--- a/qa/suites/rados/cephadm/smoke-roleless/2-services/mirror.yaml
+++ b/qa/suites/rados/cephadm/smoke-roleless/2-services/mirror.yaml
@@ -3,4 +3,7 @@ tasks:
     host.a:
       - ceph orch apply rbd-mirror "--placement=*"
       - ceph orch apply cephfs-mirror "--placement=*"
-      - sleep 120
+- cephadm.wait_for_service:
+    service: rbd-mirror
+- cephadm.wait_for_service:
+    service: cephfs-mirror
diff --git a/qa/suites/rados/cephadm/smoke-roleless/2-services/rgw.yaml b/qa/suites/rados/cephadm/smoke-roleless/2-services/rgw.yaml
index 161b15c770cf..cb2c6f4b6b8a 100644
--- a/qa/suites/rados/cephadm/smoke-roleless/2-services/rgw.yaml
+++ b/qa/suites/rados/cephadm/smoke-roleless/2-services/rgw.yaml
@@ -8,5 +8,5 @@ tasks:
           host_pattern: "*"
         spec:
           rgw_frontend_port: 8000
-- sleep:
-    interval: 60
+- cephadm.wait_for_service:
+    service: rgw.foo