rados/singleton-nomsgr/all: set require_jewel_osds

those tests do not exist anymore in master, no backport possible.

Signed-off-by: Loic Dachary <ldachary@redhat.com>

diff --git a/suites/rados/singleton-nomsgr/all/11429.yaml b/suites/rados/singleton-nomsgr/all/11429.yaml
index 144cfac60ae118ac3ff5c9c1006800538c4ecd31..e6808b2a003f745847fcc0adca47c22b60e25790 100644 (file)
--- a/suites/rados/singleton-nomsgr/all/11429.yaml
+++ b/suites/rados/singleton-nomsgr/all/11429.yaml
@@ -110,7 +110,15 @@ tasks:
 
   - install.upgrade:
       mon.a: null
-  - ceph.restart: [mon.a, mon.b, mon.c, osd.0, osd.1, osd.2]
+  - ceph.restart:
+      daemons: [mon.a, mon.b, mon.c, osd.0, osd.1, osd.2]
+      wait-for-healthy: false
+      wait-for-osds-up: true
+  - exec:
+      osd.0:
+        - sleep 300 # http://tracker.ceph.com/issues/17808
+        - ceph osd set require_jewel_osds
+  - ceph.healthy:
   - ceph_manager.wait_for_clean: null
   - ceph.restart: [osd.0, osd.1, osd.2]
   - ceph_manager.wait_for_clean: null

diff --git a/suites/rados/singleton-nomsgr/all/16113.yaml b/suites/rados/singleton-nomsgr/all/16113.yaml
index 6977aafffbfef1534f9f60b585bca0b944f146c0..6114103117ee39884a59f074c8ad57dbf41443a1 100644 (file)
--- a/suites/rados/singleton-nomsgr/all/16113.yaml
+++ b/suites/rados/singleton-nomsgr/all/16113.yaml
@@ -59,7 +59,15 @@ tasks:
       create_pool: false
 - install.upgrade:
     mon.a: null
-- ceph.restart: [mon.a, mon.b, mon.c, osd.0, osd.1, osd.2]
+- ceph.restart:
+    daemons: [mon.a, mon.b, mon.c, osd.0, osd.1, osd.2]
+    wait-for-healthy: false
+    wait-for-osds-up: true
+- exec:
+    osd.0:
+      - sleep 300 # http://tracker.ceph.com/issues/17808
+      - ceph osd set require_jewel_osds
+- ceph.healthy:
 - sleep:
     duration: 10
 - ceph_manager.wait_for_clean: null