From: Sage Weil <sage@redhat.com>
Date: Fri, 24 Jan 2020 23:25:52 +0000 (-0600)
Subject: qa/suites/fs/upgrade: finish at octopus
X-Git-Tag: v15.1.0~43^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=7ce7ac8bfc7976a87ef34787cf36ea3b22ac2b74;p=ceph-ci.git

qa/suites/fs/upgrade: finish at octopus

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

diff --git a/qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-mimic.yaml b/qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-mimic.yaml
index 9ac9f1b04f8..41630e5a159 100644
--- a/qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-mimic.yaml
+++ b/qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-mimic.yaml
@@ -36,6 +36,5 @@ tasks:
         ms bind msgr2: false
 - exec:
     osd.0:
-      - ceph osd require-osd-release mimic
       - ceph osd set-require-min-compat-client mimic
 - print: "**** done ceph"
diff --git a/qa/suites/fs/upgrade/featureful_client/old_client/tasks/2-upgrade.yaml b/qa/suites/fs/upgrade/featureful_client/old_client/tasks/2-upgrade.yaml
index 3c7f33d92e9..0ae03cb781c 100644
--- a/qa/suites/fs/upgrade/featureful_client/old_client/tasks/2-upgrade.yaml
+++ b/qa/suites/fs/upgrade/featureful_client/old_client/tasks/2-upgrade.yaml
@@ -30,7 +30,6 @@ tasks:
     wait-for-healthy: false
 - exec:
     mon.a:
-      - ceph osd require-osd-release octopus
       - ceph config set global mon_warn_on_msgr2_not_enabled false
 - ceph.healthy:
 - ceph.restart:
@@ -44,14 +43,12 @@ tasks:
     wait-for-osds-up: true
 - exec:
     mon.a:
+    - ceph osd dump -f json-pretty
+    - ceph versions
     - ceph mon enable-msgr2
     - ceph config rm global mon_warn_on_msgr2_not_enabled
+    - ceph osd require-osd-release octopus
     - for f in `ceph osd pool ls` ; do ceph osd pool set $f pg_autoscale_mode off ; done
-- exec:
-    mon.a:
-    - ceph osd dump -f json-pretty
-    - ceph versions
-    - ceph osd require-osd-release nautilus
     #- ceph osd set-require-min-compat-client nautilus
 - ceph.healthy:
 - print: "**** done ceph.restart"
diff --git a/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/0-mimic.yaml b/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/0-mimic.yaml
index 9ac9f1b04f8..41630e5a159 100644
--- a/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/0-mimic.yaml
+++ b/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/0-mimic.yaml
@@ -36,6 +36,5 @@ tasks:
         ms bind msgr2: false
 - exec:
     osd.0:
-      - ceph osd require-osd-release mimic
       - ceph osd set-require-min-compat-client mimic
 - print: "**** done ceph"
diff --git a/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/2-upgrade.yaml b/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/2-upgrade.yaml
index a35291e2986..d59091a31b3 100644
--- a/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/2-upgrade.yaml
+++ b/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/2-upgrade.yaml
@@ -43,15 +43,12 @@ tasks:
     wait-for-osds-up: true
 - exec:
     mon.a:
-    - ceph osd require-osd-release octopus
     - ceph mon enable-msgr2
+    - ceph versions
+    - ceph osd dump -f json-pretty
     - ceph config rm global mon_warn_on_msgr2_not_enabled
+    - ceph osd require-osd-release octopus
     - for f in `ceph osd pool ls` ; do ceph osd pool set $f pg_autoscale_mode off ; done
-- exec:
-    mon.a:
-    - ceph osd dump -f json-pretty
-    - ceph versions
-    - ceph osd require-osd-release nautilus
     #- ceph osd set-require-min-compat-client nautilus
 - ceph.healthy:
 - print: "**** done ceph.restart"