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 (file)
index 0000000..e69de29

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 b86ddcdc767fb4cfddb67ddd6018800cb6769b78..1a3eef867a97a6a7b8410488b481910b8c37963a 100644 (file)
--- 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 091b17f58ea623a42fde02d5310fa67c8389349d..57610eedf756050d7c90b150a3926222b9f059d3 100644 (file)
--- 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 e4cc9f96170b46a73609bd17e9ddc697b167ad37..3a5c03b1cc1d7ca6605d4ee60ad2361933e74b87 100644 (file)
--- 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 874a8c5e08bd35d1256e1a6a10a1ce7ccc8dfd34..7258c47550287915997d91d358328d8092c4f473 100644 (file)
--- 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 81563c906c9d70d90dd852b7d8023ea4baca7788..4e232bbcd8b20039a40f5fc45f8f64c8ebddfe50 100644 (file)
--- 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 e17207d200569d06e03744fcd0a4a126f5c0d8a9..9ac09aed57a8d69d4250a4bf1bcc8a506f2f1c83 100644 (file)
--- 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 4f9aac75436e366957cd1196c90805b0ae1d3c4a..2d9349e050c8e8380f278fa69422259e1507ad39 100644 (file)
--- 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 (file)
index 60e3e20..0000000
--- 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 (symlink)
index 9e99b7d..0000000
--- 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 (symlink)
index 0000000..3449838
--- /dev/null
+++ b/qa/suites/upgrade/nautilus-x/parallel/octopus.yaml
@@ -0,0 +1 @@
+.qa/releases/octopus.yaml
\ No newline at end of file