From: Kefu Chai <kchai@redhat.com>
Date: Tue, 13 Jun 2017 08:58:13 +0000 (+0800)
Subject: qa/suites/upgrade: set "sortbitwise" for jewel clusters
X-Git-Tag: v12.1.0~162^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3734280522a913ca8340ebc98b80978f63bade6f;p=ceph.git

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 ec1a88c767cf..1aaeac807db5 100644
--- 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 a185cd5cc846..f2093da6e411 100644
--- 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 c58c62c2b23d..3af3cfd72437 100644
--- 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"