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 9ac9f1b04f8943e8cc5c3afbe26737954af610ff..41630e5a159d966ade843c3ec770f8c58708859f 100644 (file)
--- 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 3c7f33d92e924ea2cd68097ac29431985db37855..0ae03cb781c67ba1c29ef2e4f253945fbbd2b009 100644 (file)
--- 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 9ac9f1b04f8943e8cc5c3afbe26737954af610ff..41630e5a159d966ade843c3ec770f8c58708859f 100644 (file)
--- 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 a35291e2986bd0d44a4ca60ed0d3e78ba817fbeb..d59091a31b31d660f1d0d3fadd237f09c8aa0714 100644 (file)
--- 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"