qa/suites/upgrade: set "sortbitwise" for jewel clusters

so ceph.healthy or wait-for-healthy won't be blocked by this warning.

Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/qa/suites/upgrade/hammer-jewel-x/parallel/3-upgrade-sequence/upgrade-all.yaml b/qa/suites/upgrade/hammer-jewel-x/parallel/3-upgrade-sequence/upgrade-all.yaml
index ec1a88c767cf7a9d083a916bc7af348303f3f43c..1aaeac807db5c8cb3a52d4b623b8820fb6c1485a 100644 (file)
--- a/qa/suites/upgrade/hammer-jewel-x/parallel/3-upgrade-sequence/upgrade-all.yaml
+++ b/qa/suites/upgrade/hammer-jewel-x/parallel/3-upgrade-sequence/upgrade-all.yaml
@@ -12,6 +12,7 @@ upgrade-sequence:
    - exec:
        mon.a:
          - sleep 300 # http://tracker.ceph.com/issues/17808
+         - ceph osd set sortbitwise
          - ceph osd set require_jewel_osds
    - ceph.healthy:
    - print: "**** done ceph.healthy"

diff --git a/qa/suites/upgrade/hammer-jewel-x/parallel/3-upgrade-sequence/upgrade-osd-mds-mon.yaml b/qa/suites/upgrade/hammer-jewel-x/parallel/3-upgrade-sequence/upgrade-osd-mds-mon.yaml
index a185cd5cc846e551fb8e7607140d616d4ae7de39..f2093da6e41196f326264570c5d77b5467d91693 100644 (file)
--- a/qa/suites/upgrade/hammer-jewel-x/parallel/3-upgrade-sequence/upgrade-osd-mds-mon.yaml
+++ b/qa/suites/upgrade/hammer-jewel-x/parallel/3-upgrade-sequence/upgrade-osd-mds-mon.yaml
@@ -29,6 +29,7 @@ upgrade-sequence:
    - exec:
        osd.0:
          - sleep 300 # http://tracker.ceph.com/issues/17808
+         - ceph osd set sortbitwise
          - ceph osd set require_jewel_osds
    - ceph.healthy:
    - sleep:

diff --git a/qa/suites/upgrade/hammer-jewel-x/tiering/3-upgrade.yaml b/qa/suites/upgrade/hammer-jewel-x/tiering/3-upgrade.yaml
index c58c62c2b23d39117028529df68145a1c6d85aa0..3af3cfd724375e9d93f6c0a1c226ffdade20cf32 100644 (file)
--- a/qa/suites/upgrade/hammer-jewel-x/tiering/3-upgrade.yaml
+++ b/qa/suites/upgrade/hammer-jewel-x/tiering/3-upgrade.yaml
@@ -46,6 +46,7 @@ upgrade-sequence:
   - exec:
       mon.a:
         - sleep 300 # http://tracker.ceph.com/issues/17808
+        - ceph osd set sortbitwise
         - ceph osd set require_jewel_osds
   - ceph.healthy:
   - print: "**** done ceph.healthy"