From: Sage Weil <sage@redhat.com>
Date: Mon, 31 Dec 2018 21:45:01 +0000 (-0600)
Subject: qa/suites/fs: make use of simple.yaml where appropriate
X-Git-Tag: v14.1.0~484^2~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8a3d90199d962a6077e05f0c4a71cbe21e9888c0;p=ceph.git

qa/suites/fs: make use of simple.yaml where appropriate

There's more needed than just ms_type=simple now.

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

diff --git a/qa/suites/fs/basic_functional/tasks/cephfs-shell/.qa b/qa/suites/fs/basic_functional/tasks/cephfs-shell/.qa
new file mode 120000
index 000000000000..fea2489fdf6d
--- /dev/null
+++ b/qa/suites/fs/basic_functional/tasks/cephfs-shell/.qa
@@ -0,0 +1 @@
+../.qa
\ No newline at end of file
diff --git a/qa/suites/fs/basic_functional/tasks/cephfs-shell/simple.yaml b/qa/suites/fs/basic_functional/tasks/cephfs-shell/simple.yaml
new file mode 120000
index 000000000000..780dc0ea8205
--- /dev/null
+++ b/qa/suites/fs/basic_functional/tasks/cephfs-shell/simple.yaml
@@ -0,0 +1 @@
+.qa/msgr/simple.yaml
\ No newline at end of file
diff --git a/qa/suites/fs/basic_functional/tasks/cephfs-shell/test.yaml b/qa/suites/fs/basic_functional/tasks/cephfs-shell/test.yaml
index b4f0d4ab057c..93c1eb54e8f6 100644
--- a/qa/suites/fs/basic_functional/tasks/cephfs-shell/test.yaml
+++ b/qa/suites/fs/basic_functional/tasks/cephfs-shell/test.yaml
@@ -2,13 +2,6 @@
 # This overrides the random distribution that's chosen in the other yaml fragments.
 os_type: ubuntu
 os_version: "18.04"
-
-overrides:
-  ceph:
-    conf:
-      global:
-        ms type: simple
-
 tasks:
   - cephfs_test_runner:
       modules:
diff --git a/qa/suites/fs/basic_functional/tasks/sessionmap.yaml b/qa/suites/fs/basic_functional/tasks/sessionmap.yaml
deleted file mode 100644
index 2926c73243a9..000000000000
--- a/qa/suites/fs/basic_functional/tasks/sessionmap.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-overrides:
-  ceph:
-    conf:
-      global:
-        ms type: simple
-    log-whitelist:
-      - client session with non-allowable root
-
-tasks:
-  - cephfs_test_runner:
-      modules:
-        - tasks.cephfs.test_sessionmap
diff --git a/qa/suites/fs/basic_functional/tasks/sessionmap/+ b/qa/suites/fs/basic_functional/tasks/sessionmap/+
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/qa/suites/fs/basic_functional/tasks/sessionmap/.qa b/qa/suites/fs/basic_functional/tasks/sessionmap/.qa
new file mode 120000
index 000000000000..fea2489fdf6d
--- /dev/null
+++ b/qa/suites/fs/basic_functional/tasks/sessionmap/.qa
@@ -0,0 +1 @@
+../.qa
\ No newline at end of file
diff --git a/qa/suites/fs/basic_functional/tasks/sessionmap/sessionmap.yaml b/qa/suites/fs/basic_functional/tasks/sessionmap/sessionmap.yaml
new file mode 100644
index 000000000000..1d72301bd4d3
--- /dev/null
+++ b/qa/suites/fs/basic_functional/tasks/sessionmap/sessionmap.yaml
@@ -0,0 +1,10 @@
+
+overrides:
+  ceph:
+    log-whitelist:
+      - client session with non-allowable root
+
+tasks:
+  - cephfs_test_runner:
+      modules:
+        - tasks.cephfs.test_sessionmap
diff --git a/qa/suites/fs/basic_functional/tasks/sessionmap/simple.yaml b/qa/suites/fs/basic_functional/tasks/sessionmap/simple.yaml
new file mode 120000
index 000000000000..780dc0ea8205
--- /dev/null
+++ b/qa/suites/fs/basic_functional/tasks/sessionmap/simple.yaml
@@ -0,0 +1 @@
+.qa/msgr/simple.yaml
\ No newline at end of file
diff --git a/qa/suites/fs/basic_functional/tasks/volume-client/.qa b/qa/suites/fs/basic_functional/tasks/volume-client/.qa
new file mode 120000
index 000000000000..fea2489fdf6d
--- /dev/null
+++ b/qa/suites/fs/basic_functional/tasks/volume-client/.qa
@@ -0,0 +1 @@
+../.qa
\ No newline at end of file
diff --git a/qa/suites/fs/basic_functional/tasks/volume-client/task/.qa b/qa/suites/fs/basic_functional/tasks/volume-client/task/.qa
new file mode 120000
index 000000000000..fea2489fdf6d
--- /dev/null
+++ b/qa/suites/fs/basic_functional/tasks/volume-client/task/.qa
@@ -0,0 +1 @@
+../.qa
\ No newline at end of file
diff --git a/qa/suites/fs/basic_functional/tasks/volume-client/task/test/+ b/qa/suites/fs/basic_functional/tasks/volume-client/task/test/+
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/qa/suites/fs/basic_functional/tasks/volume-client/task/test/.qa b/qa/suites/fs/basic_functional/tasks/volume-client/task/test/.qa
new file mode 120000
index 000000000000..fea2489fdf6d
--- /dev/null
+++ b/qa/suites/fs/basic_functional/tasks/volume-client/task/test/.qa
@@ -0,0 +1 @@
+../.qa
\ No newline at end of file
diff --git a/qa/suites/fs/basic_functional/tasks/volume-client/task/test/simple.yaml b/qa/suites/fs/basic_functional/tasks/volume-client/task/test/simple.yaml
new file mode 120000
index 000000000000..780dc0ea8205
--- /dev/null
+++ b/qa/suites/fs/basic_functional/tasks/volume-client/task/test/simple.yaml
@@ -0,0 +1 @@
+.qa/msgr/simple.yaml
\ No newline at end of file
diff --git a/qa/suites/fs/basic_functional/tasks/volume-client/task/test/test.yaml b/qa/suites/fs/basic_functional/tasks/volume-client/task/test/test.yaml
new file mode 100644
index 000000000000..f038721cb3b6
--- /dev/null
+++ b/qa/suites/fs/basic_functional/tasks/volume-client/task/test/test.yaml
@@ -0,0 +1,12 @@
+overrides:
+  ceph:
+    mon_bind_msgr2: false
+    conf:
+      global:
+        ms type: simple
+        ms bind msgr2: false
+
+tasks:
+  - cephfs_test_runner:
+      modules:
+        - tasks.cephfs.test_volume_client
diff --git a/qa/suites/fs/basic_functional/tasks/volume-client/test.yaml b/qa/suites/fs/basic_functional/tasks/volume-client/test.yaml
deleted file mode 100644
index e8c850a05cdd..000000000000
--- a/qa/suites/fs/basic_functional/tasks/volume-client/test.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-overrides:
-  ceph:
-    conf:
-      global:
-        ms type: simple
-
-tasks:
-  - cephfs_test_runner:
-      modules:
-        - tasks.cephfs.test_volume_client