Merge PR ceph#27138 into master

* refs/pull/27138/head: qa/suites/upgrade/nautilus-x: misc updates Reviewed-by: Yuri Weinstein <[email protected]>
LeoHubery · Mar 23, 2019 · 25ae57b · 25ae57b
2 parents b28a05a + f3499b1
commit 25ae57b
Show file tree

Hide file tree

Showing 11 changed files with 5 additions and 18 deletions.
diff --git a/qa/releases/octopus.yaml b/qa/releases/octopus.yaml
diff --git a/qa/suites/upgrade/nautilus-x/parallel/0-cluster/start.yaml b/qa/suites/upgrade/nautilus-x/parallel/0-cluster/start.yaml
@@ -28,8 +28,6 @@ roles:
   - client.3
 overrides:
   ceph:
-    mon_bind_msgr2: false
-    mon_bind_addrvec: false
     log-whitelist:
     - scrub mismatch
     - ScrubResult
@@ -38,7 +36,6 @@ overrides:
     - \(SLOW_OPS\)
     - overall HEALTH_
     - slow request
-    - \(MON_MSGR2_NOT_ENABLED\)
     conf:
       global:
         enable experimental unrecoverable data corrupting features: "*"
@@ -47,4 +44,3 @@ overrides:
       osd:
         osd class load list: "*"
         osd class default list: "*"
-    fs: xfs
diff --git a/qa/suites/upgrade/nautilus-x/parallel/1-ceph-install/nautilus.yaml b/qa/suites/upgrade/nautilus-x/parallel/1-ceph-install/nautilus.yaml
@@ -27,7 +27,6 @@ tasks:
         mon warn on pool no app: false
 - exec:
     osd.0:
-      - ceph osd require-osd-release nautilus
       - ceph osd set-require-min-compat-client nautilus
 - print: "**** done ceph"
 - install.upgrade:

diff --git a/qa/suites/upgrade/nautilus-x/parallel/2-workload/rados_api.yaml b/qa/suites/upgrade/nautilus-x/parallel/2-workload/rados_api.yaml
@@ -4,7 +4,7 @@ meta:
 workload:
   full_sequential:
     - workunit:
-        branch: luminous
+        branch: nautilus
         clients:
           client.0:
             - cls

diff --git a/qa/suites/upgrade/nautilus-x/parallel/2-workload/rados_loadgenbig.yaml b/qa/suites/upgrade/nautilus-x/parallel/2-workload/rados_loadgenbig.yaml
@@ -4,7 +4,7 @@ meta:
 workload:
   full_sequential:
     - workunit:
-        branch: luminous
+        branch: nautilus
         clients:
           client.0:
             - rados/load-gen-big.sh

diff --git a/qa/suites/upgrade/nautilus-x/parallel/2-workload/test_rbd_api.yaml b/qa/suites/upgrade/nautilus-x/parallel/2-workload/test_rbd_api.yaml
@@ -4,7 +4,7 @@ meta:
 workload:
   full_sequential:
     - workunit:
-        branch: luminous
+        branch: nautilus
         clients:
           client.0:
             - rbd/test_librbd.sh

diff --git a/qa/suites/upgrade/nautilus-x/parallel/2-workload/test_rbd_python.yaml b/qa/suites/upgrade/nautilus-x/parallel/2-workload/test_rbd_python.yaml
@@ -4,7 +4,7 @@ meta:
 workload:
   full_sequential:
     - workunit:
-        branch: luminous
+        branch: nautilus
         clients:
           client.0:
             - rbd/test_librbd_python.sh

diff --git a/qa/suites/upgrade/nautilus-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/qa/suites/upgrade/nautilus-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
@@ -22,9 +22,6 @@ upgrade-sequence:
        daemons: [mon.c]
        wait-for-healthy: false
        mon-health-to-clog: false
-   - exec:
-       mon.a:
-         - ceph config set global mon_warn_on_msgr2_not_enabled false
    - ceph.healthy:
    - sleep:
        duration: 60

diff --git a/qa/suites/upgrade/nautilus-x/parallel/4-msgr2.yaml b/qa/suites/upgrade/nautilus-x/parallel/4-msgr2.yaml
diff --git a/qa/suites/upgrade/nautilus-x/parallel/4-nautilus.yaml b/qa/suites/upgrade/nautilus-x/parallel/4-nautilus.yaml
diff --git a/qa/suites/upgrade/nautilus-x/parallel/octopus.yaml b/qa/suites/upgrade/nautilus-x/parallel/octopus.yaml
@@ -0,0 +1 @@
+.qa/releases/octopus.yaml