From: Nathan Cutler <ncutler@suse.com>
Date: Thu, 27 Apr 2017 19:52:51 +0000 (+0200)
Subject: tests: rados: move cephtool.yaml to new singleton/bluestore subsuite
X-Git-Tag: v12.0.3~167^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F14847%2Fhead;p=ceph.git

tests: rados: move cephtool.yaml to new singleton/bluestore subsuite

cephtool.yaml is bluestore-only, yet it was in singleton/ which runs against a
generalized objectstore matrix.

Fixes: http://tracker.ceph.com/issues/19797
Signed-off-by: Nathan Cutler <ncutler@suse.com>
---

diff --git a/qa/suites/rados/singleton-bluestore/all/cephtool.yaml b/qa/suites/rados/singleton-bluestore/all/cephtool.yaml
new file mode 100644
index 000000000000..880628f4fd2b
--- /dev/null
+++ b/qa/suites/rados/singleton-bluestore/all/cephtool.yaml
@@ -0,0 +1,28 @@
+roles:
+- - mon.a
+  - mon.b
+  - mon.c
+  - mgr.x
+  - osd.0
+  - osd.1
+  - osd.2
+  - client.0
+openstack:
+  - volumes: # attached to each instance
+      count: 3
+      size: 10 # GB
+tasks:
+- install:
+- ceph:
+    log-whitelist:
+    - wrongly marked me down
+    - had wrong client addr
+    - had wrong cluster addr
+    - must scrub before tier agent can activate
+    - failsafe engaged, dropping updates
+    - failsafe disengaged, no longer dropping updates
+- workunit:
+    clients:
+      all:
+        - cephtool
+        - mon/pool_ops.sh
diff --git a/qa/suites/rados/singleton-bluestore/msgr b/qa/suites/rados/singleton-bluestore/msgr
new file mode 120000
index 000000000000..b29ecddaed7e
--- /dev/null
+++ b/qa/suites/rados/singleton-bluestore/msgr
@@ -0,0 +1 @@
+../basic/msgr
\ No newline at end of file
diff --git a/qa/suites/rados/singleton-bluestore/msgr-failures/few.yaml b/qa/suites/rados/singleton-bluestore/msgr-failures/few.yaml
new file mode 100644
index 000000000000..0de320d46b8e
--- /dev/null
+++ b/qa/suites/rados/singleton-bluestore/msgr-failures/few.yaml
@@ -0,0 +1,5 @@
+overrides:
+  ceph:
+    conf:
+      global:
+        ms inject socket failures: 5000
diff --git a/qa/suites/rados/singleton-bluestore/msgr-failures/many.yaml b/qa/suites/rados/singleton-bluestore/msgr-failures/many.yaml
new file mode 100644
index 000000000000..86f8dde8a0e3
--- /dev/null
+++ b/qa/suites/rados/singleton-bluestore/msgr-failures/many.yaml
@@ -0,0 +1,5 @@
+overrides:
+  ceph:
+    conf:
+      global:
+        ms inject socket failures: 500
diff --git a/qa/suites/rados/singleton-bluestore/objectstore/bluestore-comp.yaml b/qa/suites/rados/singleton-bluestore/objectstore/bluestore-comp.yaml
new file mode 120000
index 000000000000..b23b2a792731
--- /dev/null
+++ b/qa/suites/rados/singleton-bluestore/objectstore/bluestore-comp.yaml
@@ -0,0 +1 @@
+../../../../objectstore/bluestore-comp.yaml
\ No newline at end of file
diff --git a/qa/suites/rados/singleton-bluestore/objectstore/bluestore.yaml b/qa/suites/rados/singleton-bluestore/objectstore/bluestore.yaml
new file mode 120000
index 000000000000..bd7d7e004a1b
--- /dev/null
+++ b/qa/suites/rados/singleton-bluestore/objectstore/bluestore.yaml
@@ -0,0 +1 @@
+../../../../objectstore/bluestore.yaml
\ No newline at end of file
diff --git a/qa/suites/rados/singleton-bluestore/rados.yaml b/qa/suites/rados/singleton-bluestore/rados.yaml
new file mode 120000
index 000000000000..b756e57bcf09
--- /dev/null
+++ b/qa/suites/rados/singleton-bluestore/rados.yaml
@@ -0,0 +1 @@
+../../../config/rados.yaml
\ No newline at end of file
diff --git a/qa/suites/rados/singleton/all/cephtool.yaml b/qa/suites/rados/singleton/all/cephtool.yaml
deleted file mode 100644
index 880628f4fd2b..000000000000
--- a/qa/suites/rados/singleton/all/cephtool.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-roles:
-- - mon.a
-  - mon.b
-  - mon.c
-  - mgr.x
-  - osd.0
-  - osd.1
-  - osd.2
-  - client.0
-openstack:
-  - volumes: # attached to each instance
-      count: 3
-      size: 10 # GB
-tasks:
-- install:
-- ceph:
-    log-whitelist:
-    - wrongly marked me down
-    - had wrong client addr
-    - had wrong cluster addr
-    - must scrub before tier agent can activate
-    - failsafe engaged, dropping updates
-    - failsafe disengaged, no longer dropping updates
-- workunit:
-    clients:
-      all:
-        - cephtool
-        - mon/pool_ops.sh