From: Sage Weil <sage@redhat.com>
Date: Tue, 18 Jul 2017 16:32:17 +0000 (-0400)
Subject: qa/suites/upgrade/jewel-x/point-to-point: move set-require-min-compat-client
X-Git-Tag: v12.1.2~201^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7102de8761c819fa748a176931d8b1e3722ab858;p=ceph.git

qa/suites/upgrade/jewel-x/point-to-point: move set-require-min-compat-client

Do it after workload completes and all jewel clients go away.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/qa/suites/upgrade/jewel-x/point-to-point-x/point-to-point-upgrade.yaml b/qa/suites/upgrade/jewel-x/point-to-point-x/point-to-point-upgrade.yaml
index 67d57f7b3f36..d690682930aa 100644
--- a/qa/suites/upgrade/jewel-x/point-to-point-x/point-to-point-upgrade.yaml
+++ b/qa/suites/upgrade/jewel-x/point-to-point-x/point-to-point-upgrade.yaml
@@ -80,6 +80,9 @@ tasks:
    - workload_x
    - upgrade-sequence_x
 - print: "**** done parallel -x branch"
+- exec:
+    osd.0:
+      - ceph osd set-require-min-compat-client luminous
 # Run librados tests on the -x upgraded cluster
 - install.upgrade:
     client.1:
@@ -221,6 +224,5 @@ upgrade-sequence_x:
    - exec:
        osd.0:
          - ceph osd require-osd-release luminous
-         - ceph osd set-require-min-compat-client luminous
    - ceph.healthy:
    - print: "**** done ceph.restart all -x branch mds/osd/mon"