From f3499b10b3ceee3c0473a97734df99864f9d78fe Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 22 Mar 2019 16:38:27 -0500 Subject: [PATCH] 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 --- qa/releases/octopus.yaml | 0 qa/suites/upgrade/nautilus-x/parallel/0-cluster/start.yaml | 4 ---- .../upgrade/nautilus-x/parallel/1-ceph-install/nautilus.yaml | 1 - .../upgrade/nautilus-x/parallel/2-workload/rados_api.yaml | 2 +- .../nautilus-x/parallel/2-workload/rados_loadgenbig.yaml | 2 +- .../upgrade/nautilus-x/parallel/2-workload/test_rbd_api.yaml | 2 +- .../nautilus-x/parallel/2-workload/test_rbd_python.yaml | 2 +- .../parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml | 3 --- qa/suites/upgrade/nautilus-x/parallel/4-msgr2.yaml | 5 ----- qa/suites/upgrade/nautilus-x/parallel/4-nautilus.yaml | 1 - qa/suites/upgrade/nautilus-x/parallel/octopus.yaml | 1 + 11 files changed, 5 insertions(+), 18 deletions(-) create mode 100644 qa/releases/octopus.yaml delete mode 100644 qa/suites/upgrade/nautilus-x/parallel/4-msgr2.yaml delete mode 120000 qa/suites/upgrade/nautilus-x/parallel/4-nautilus.yaml create mode 120000 qa/suites/upgrade/nautilus-x/parallel/octopus.yaml diff --git a/qa/releases/octopus.yaml b/qa/releases/octopus.yaml new file mode 100644 index 0000000000000..e69de29bb2d1d 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 b86ddcdc767fb..1a3eef867a97a 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 091b17f58ea62..57610eedf7560 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 e4cc9f96170b4..3a5c03b1cc1d7 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 874a8c5e08bd3..7258c47550287 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 81563c906c9d7..4e232bbcd8b20 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 e17207d200569..9ac09aed57a8d 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 4f9aac75436e3..2d9349e050c8e 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 60e3e200578c0..0000000000000 --- 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 9e99b7d282943..0000000000000 --- 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 0000000000000..344983858fc5e --- /dev/null +++ b/qa/suites/upgrade/nautilus-x/parallel/octopus.yaml @@ -0,0 +1 @@ +.qa/releases/octopus.yaml \ No newline at end of file -- 2.39.5