From: Sage Weil <sage@redhat.com>
Date: Fri, 22 Mar 2019 21:38:27 +0000 (-0500)
Subject: qa/suites/upgrade/nautilus-x: misc updates
X-Git-Tag: v15.0.0~117^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F27138%2Fhead;p=ceph.git

qa/suites/upgrade/nautilus-x: misc updates

- start with msgr2 enabled (defaults)
- run nautilus branch for workunits
- drop msgr2 enable step at teh end
- add octopus placeholder (although it is empty for now)

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

diff --git a/qa/releases/octopus.yaml b/qa/releases/octopus.yaml
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/qa/suites/upgrade/nautilus-x/parallel/0-cluster/start.yaml b/qa/suites/upgrade/nautilus-x/parallel/0-cluster/start.yaml
index b86ddcdc767f..1a3eef867a97 100644
--- 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
index 091b17f58ea6..57610eedf756 100644
--- 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
index e4cc9f96170b..3a5c03b1cc1d 100644
--- 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
index 874a8c5e08bd..7258c4755028 100644
--- 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
index 81563c906c9d..4e232bbcd8b2 100644
--- 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
index e17207d20056..9ac09aed57a8 100644
--- 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
index 4f9aac75436e..2d9349e050c8 100644
--- 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
deleted file mode 100644
index 60e3e200578c..000000000000
--- a/qa/suites/upgrade/nautilus-x/parallel/4-msgr2.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- exec:
-    mon.a:
-      - ceph mon enable-msgr2
-      - ceph config rm global mon_warn_on_msgr2_not_enabled
diff --git a/qa/suites/upgrade/nautilus-x/parallel/4-nautilus.yaml b/qa/suites/upgrade/nautilus-x/parallel/4-nautilus.yaml
deleted file mode 120000
index 9e99b7d28294..000000000000
--- a/qa/suites/upgrade/nautilus-x/parallel/4-nautilus.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/releases/nautilus.yaml
\ No newline at end of file
diff --git a/qa/suites/upgrade/nautilus-x/parallel/octopus.yaml b/qa/suites/upgrade/nautilus-x/parallel/octopus.yaml
new file mode 120000
index 000000000000..344983858fc5
--- /dev/null
+++ b/qa/suites/upgrade/nautilus-x/parallel/octopus.yaml
@@ -0,0 +1 @@
+.qa/releases/octopus.yaml
\ No newline at end of file