From: Sage Weil <sage@redhat.com>
Date: Wed, 20 Mar 2019 11:55:28 +0000 (-0500)
Subject: qa/suites/rados/thrash-old-clients: collapse msgr and client choice
X-Git-Tag: v15.0.0~141^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=07f0a26770b2debf492f9a473631dfdd2915ffb6;p=ceph.git

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 <sage@redhat.com>
---

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