rados/objectstore: move objectstore related tests from singleton-nomsgr

Just so they're in a nice convenient bunch.

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

diff --git a/suites/rados/objectstore/alloc-hint.yaml b/suites/rados/objectstore/alloc-hint.yaml
new file mode 100644 (file)
index 0000000..8315aba
--- /dev/null
+++ b/suites/rados/objectstore/alloc-hint.yaml
@@ -0,0 +1,17 @@
+roles:
+- [mon.a, osd.0, osd.1, osd.2, client.0]
+
+overrides:
+  ceph:
+    fs: xfs
+    conf:
+      osd:
+        filestore xfs extsize: true
+
+tasks:
+- install:
+- ceph:
+- workunit:
+    clients:
+      all:
+        - rados/test_alloc_hint.sh

diff --git a/suites/rados/objectstore/filejournal.yaml b/suites/rados/objectstore/filejournal.yaml
new file mode 100644 (file)
index 0000000..c647a61
--- /dev/null
+++ b/suites/rados/objectstore/filejournal.yaml
@@ -0,0 +1,8 @@
+roles:
+- [mon.0, osd.0, osd.1, client.0]
+tasks:
+- install:
+- ceph:
+- exec:
+    client.0:
+      - ceph_test_filejournal

diff --git a/suites/rados/objectstore/filestore-idempotent-aio-journal.yaml b/suites/rados/objectstore/filestore-idempotent-aio-journal.yaml
new file mode 100644 (file)
index 0000000..17fe515
--- /dev/null
+++ b/suites/rados/objectstore/filestore-idempotent-aio-journal.yaml
@@ -0,0 +1,9 @@
+roles:
+- [mon.0, osd.0, osd.1, client.0]
+tasks:
+- install:
+- ceph:
+    conf:
+      global:
+        journal aio: true
+- filestore_idempotent:

diff --git a/suites/rados/objectstore/filestore-idempotent.yaml b/suites/rados/objectstore/filestore-idempotent.yaml
new file mode 100644 (file)
index 0000000..3d1894c
--- /dev/null
+++ b/suites/rados/objectstore/filestore-idempotent.yaml
@@ -0,0 +1,6 @@
+roles:
+- [mon.0, osd.0, osd.1, client.0]
+tasks:
+- install:
+- ceph:
+- filestore_idempotent:

diff --git a/suites/rados/objectstore/objectcacher-stress.yaml b/suites/rados/objectstore/objectcacher-stress.yaml
new file mode 100644 (file)
index 0000000..8b091c9
--- /dev/null
+++ b/suites/rados/objectstore/objectcacher-stress.yaml
@@ -0,0 +1,9 @@
+roles:
+- [mon.0, osd.0, osd.1, client.0]
+tasks:
+- install:
+- ceph:
+- workunit:
+    clients:
+      all:
+        - osdc/stress_objectcacher.sh

diff --git a/suites/rados/objectstore/objectstore.yaml b/suites/rados/objectstore/objectstore.yaml
new file mode 100644 (file)
index 0000000..a0ece14
--- /dev/null
+++ b/suites/rados/objectstore/objectstore.yaml
@@ -0,0 +1,8 @@
+roles:
+- [mon.0, osd.0, osd.1, client.0]
+tasks:
+- install:
+- exec:
+    client.0:
+      - mkdir $TESTDIR/ostest && cd $TESTDIR/ostest && ceph_test_objectstore
+      - rm -rf $TESTDIR/ostest

diff --git a/suites/rados/singleton-nomsgr/all/alloc-hint.yaml b/suites/rados/singleton-nomsgr/all/alloc-hint.yaml
deleted file mode 100644 (file)
index 8315aba..0000000
--- a/suites/rados/singleton-nomsgr/all/alloc-hint.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-roles:
-- [mon.a, osd.0, osd.1, osd.2, client.0]
-
-overrides:
-  ceph:
-    fs: xfs
-    conf:
-      osd:
-        filestore xfs extsize: true
-
-tasks:
-- install:
-- ceph:
-- workunit:
-    clients:
-      all:
-        - rados/test_alloc_hint.sh

diff --git a/suites/rados/singleton-nomsgr/all/filejournal.yaml b/suites/rados/singleton-nomsgr/all/filejournal.yaml
deleted file mode 100644 (file)
index c647a61..0000000
--- a/suites/rados/singleton-nomsgr/all/filejournal.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-roles:
-- [mon.0, osd.0, osd.1, client.0]
-tasks:
-- install:
-- ceph:
-- exec:
-    client.0:
-      - ceph_test_filejournal

diff --git a/suites/rados/singleton-nomsgr/all/filestore-idempotent-aio-journal.yaml b/suites/rados/singleton-nomsgr/all/filestore-idempotent-aio-journal.yaml
deleted file mode 100644 (file)
index 17fe515..0000000
--- a/suites/rados/singleton-nomsgr/all/filestore-idempotent-aio-journal.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-roles:
-- [mon.0, osd.0, osd.1, client.0]
-tasks:
-- install:
-- ceph:
-    conf:
-      global:
-        journal aio: true
-- filestore_idempotent:

diff --git a/suites/rados/singleton-nomsgr/all/filestore-idempotent.yaml b/suites/rados/singleton-nomsgr/all/filestore-idempotent.yaml
deleted file mode 100644 (file)
index 3d1894c..0000000
--- a/suites/rados/singleton-nomsgr/all/filestore-idempotent.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-roles:
-- [mon.0, osd.0, osd.1, client.0]
-tasks:
-- install:
-- ceph:
-- filestore_idempotent:

diff --git a/suites/rados/singleton-nomsgr/all/objectcacher-stress.yaml b/suites/rados/singleton-nomsgr/all/objectcacher-stress.yaml
deleted file mode 100644 (file)
index 8b091c9..0000000
--- a/suites/rados/singleton-nomsgr/all/objectcacher-stress.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-roles:
-- [mon.0, osd.0, osd.1, client.0]
-tasks:
-- install:
-- ceph:
-- workunit:
-    clients:
-      all:
-        - osdc/stress_objectcacher.sh

diff --git a/suites/rados/singleton-nomsgr/all/objectstore.yaml b/suites/rados/singleton-nomsgr/all/objectstore.yaml
deleted file mode 100644 (file)
index a0ece14..0000000
--- a/suites/rados/singleton-nomsgr/all/objectstore.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-roles:
-- [mon.0, osd.0, osd.1, client.0]
-tasks:
-- install:
-- exec:
-    client.0:
-      - mkdir $TESTDIR/ostest && cd $TESTDIR/ostest && ceph_test_objectstore
-      - rm -rf $TESTDIR/ostest