tests: add require_jewel_osds to upgrade/hammer-x/tiering

Without this, the test tends to fail, but sometimes passes (apparently because
the "wait-for-healthy: true" in the last ceph.restart is racy - HEALTH_OK is
received before the MONs notice that all OSDs are running jewel without
require_jewel_osds.

Signed-off-by: Nathan Cutler <ncutler@suse.com>

diff --git a/qa/suites/upgrade/hammer-x/tiering/3-upgrade/upgrade.yaml b/qa/suites/upgrade/hammer-x/tiering/3-upgrade/upgrade.yaml
index e43b6b674b09bf1e155badaea826d0df72f99604..1627dbedaca8b8bfe02a7a0d9bb5e7484362cf59 100644 (file)
--- a/qa/suites/upgrade/hammer-x/tiering/3-upgrade/upgrade.yaml
+++ b/qa/suites/upgrade/hammer-x/tiering/3-upgrade/upgrade.yaml
@@ -71,9 +71,15 @@ upgrade-second-half:
       duration: 60
   - ceph.restart:
       daemons: [osd.3]
-      wait-for-healthy: true
+      wait-for-healthy: false
+      wait-for-osds-up: true
   - sleep:
       duration: 60
+   - exec:
+       mon.a:
+         - ceph osd set require_jewel_osds
+  - ceph.healthy:
+  - print: "**** HEALTH_OK reached after upgrading last OSD to jewel"
 
 flip-but-fail:
   sequential: