From 07f0a26770b2debf492f9a473631dfdd2915ffb6 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 20 Mar 2019 06:55:28 -0500 Subject: [PATCH] qa/suites/rados/thrash-old-clients: collapse msgr and client choice Hammer doesn't have async, and nautilus doesn't have simple. Expand the async default (v2v1) and v1-only choice and the client choice. Signed-off-by: Sage Weil --- .../thrash-old-clients/1-install/hammer.yaml | 2 -- .../1-install/jewel-v1only.yaml | 26 +++++++++++++++++++ .../1-install/luminous-v1only.yaml | 22 ++++++++++++++++ qa/suites/rados/thrash-old-clients/msgr/.qa | 1 - .../thrash-old-clients/msgr/async-v1only.yaml | 1 - .../rados/thrash-old-clients/msgr/async.yaml | 1 - 6 files changed, 48 insertions(+), 5 deletions(-) create mode 100644 qa/suites/rados/thrash-old-clients/1-install/jewel-v1only.yaml create mode 100644 qa/suites/rados/thrash-old-clients/1-install/luminous-v1only.yaml delete mode 120000 qa/suites/rados/thrash-old-clients/msgr/.qa delete mode 120000 qa/suites/rados/thrash-old-clients/msgr/async-v1only.yaml delete mode 120000 qa/suites/rados/thrash-old-clients/msgr/async.yaml diff --git a/qa/suites/rados/thrash-old-clients/1-install/hammer.yaml b/qa/suites/rados/thrash-old-clients/1-install/hammer.yaml index ed620c6852d..1f9cd277e70 100644 --- a/qa/suites/rados/thrash-old-clients/1-install/hammer.yaml +++ b/qa/suites/rados/thrash-old-clients/1-install/hammer.yaml @@ -4,8 +4,6 @@ overrides: conf: mon: mon osd initial require min compat client: hammer - client: - ms type: simple tasks: - install: branch: hammer diff --git a/qa/suites/rados/thrash-old-clients/1-install/jewel-v1only.yaml b/qa/suites/rados/thrash-old-clients/1-install/jewel-v1only.yaml new file mode 100644 index 00000000000..5468e520585 --- /dev/null +++ b/qa/suites/rados/thrash-old-clients/1-install/jewel-v1only.yaml @@ -0,0 +1,26 @@ +overrides: + ceph: + mon_bind_msgr2: false + conf: + global: + ms type: async + ms bind msgr2: false +tasks: +- install: + branch: jewel + exclude_packages: + - librados3 + - ceph-mgr-dashboard + - ceph-mgr-diskprediction-local + - ceph-mgr-diskprediction-cloud + - ceph-mgr-rook + - ceph-mgr-ssh + - ceph-mgr + - libcephfs2 + - libcephfs-devel + - libcephfs-dev + extra_packages: ['librados2'] +- install.upgrade: + mon.a: + mon.b: + mon.c: diff --git a/qa/suites/rados/thrash-old-clients/1-install/luminous-v1only.yaml b/qa/suites/rados/thrash-old-clients/1-install/luminous-v1only.yaml new file mode 100644 index 00000000000..09698142972 --- /dev/null +++ b/qa/suites/rados/thrash-old-clients/1-install/luminous-v1only.yaml @@ -0,0 +1,22 @@ +overrides: + ceph: + mon_bind_msgr2: false + conf: + global: + ms type: async + ms bind msgr2: false +tasks: +- install: + branch: luminous + exclude_packages: + - librados3 + - ceph-mgr-dashboard + - ceph-mgr-diskprediction-local + - ceph-mgr-diskprediction-cloud + - ceph-mgr-rook + - ceph-mgr-ssh + extra_packages: ['librados2'] +- install.upgrade: + mon.a: + mon.b: + mon.c: diff --git a/qa/suites/rados/thrash-old-clients/msgr/.qa b/qa/suites/rados/thrash-old-clients/msgr/.qa deleted file mode 120000 index fea2489fdf6..00000000000 --- a/qa/suites/rados/thrash-old-clients/msgr/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa \ No newline at end of file diff --git a/qa/suites/rados/thrash-old-clients/msgr/async-v1only.yaml b/qa/suites/rados/thrash-old-clients/msgr/async-v1only.yaml deleted file mode 120000 index 9673dbb0126..00000000000 --- a/qa/suites/rados/thrash-old-clients/msgr/async-v1only.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/msgr/async-v1only.yaml \ No newline at end of file diff --git a/qa/suites/rados/thrash-old-clients/msgr/async.yaml b/qa/suites/rados/thrash-old-clients/msgr/async.yaml deleted file mode 120000 index b7f05e4cda3..00000000000 --- a/qa/suites/rados/thrash-old-clients/msgr/async.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/msgr/async.yaml \ No newline at end of file -- 2.39.5