restructure in terms of collections

diff --git a/README b/README
index 9c9969ecb28989dd18df5305f97655766e717223..f72bed6554f453eb5b3985c414dca6a0e119afb5 100644 (file)
--- a/README
+++ b/README
@@ -1,21 +1,35 @@
 ceph-qa-suite
 -------------
 
-The basic idea is that the set of tests to run consists of all
+clusters/    - some predefined cluster layouts
+tasks/       - some predefined task fragments
+collections/ - collections of tests to actually run
+
+We have several collections, each a subdirectory within collections/.
+Each collection directory consists of a set facets.  The basic idea is
+that, for each collection, the set of tests to run consists of all
 combinations of taking one yaml fragment from each facet.
 
-Each directory represents a facet.  For example, given the files
+For example, given the files
 
-  clusters/
-  clusters/fixed-3.yaml
-  clusters/fixed-9.yaml
-  tasks/
-  tasks/a
-  tasks/b
-  tasks/c
+  collections/
+  collections/foo/
+  collections/foo/clusters/
+  collections/foo/clusters/fixed-3.yaml
+  collections/foo/clusters/fixed-9.yaml
+  collections/foo/tasks/
+  collections/foo/tasks/a
+  collections/foo/tasks/b
+  collections/foo/tasks/c
+  collections/bar/
+  collections/bar/clusters/fixed-3.yaml
+  collections/bar/tasks/
+  collections/bar/tasks/d
+  collections/bar/tasks/e
 
-teuthology-suite would run tasks a, b, and c on both fixed-3 and fixed-9
-clusters.  
+teuthology-suite would run tasks a, b, and c on both fixed-3 and
+fixed-9 clusters.  It would also run tasks d and e on the fixed-3
+cluster.
 
 Note that the 'clusters' and 'tasks' terminology is actually
 meaningless here.  All teuthology-suite does is stick the yaml
@@ -23,8 +37,7 @@ fragments together (one from each facet) and run teuthology on the
 result (optionally combined with any additional fragments passed on
 the command line).
 
-
-That is the current approach.  Eventually we may want something
-smarter, like different collections of facets, or some other way to
-limit the total size of the test space (e.g., running certain tasks
-only on certain clusters).
+In practice, we can keep common/shared task and cluster definitions in
+the top-level clusters/ and tasks/ directories (which are otherwise
+ignored), and symlink to them from the collections that want to use
+them.

diff --git a/collections/basic/clusters/fixed-3.yaml b/collections/basic/clusters/fixed-3.yaml
new file mode 120000 (symlink)
index 0000000..19a55d2
--- /dev/null
+++ b/collections/basic/clusters/fixed-3.yaml
@@ -0,0 +1 @@
+../../../clusters/fixed-3.yaml
\ No newline at end of file

diff --git a/collections/basic/tasks/cfuse_dbench.yaml b/collections/basic/tasks/cfuse_dbench.yaml
new file mode 100644 (file)
index 0000000..63b5efb
--- /dev/null
+++ b/collections/basic/tasks/cfuse_dbench.yaml
@@ -0,0 +1,5 @@
+tasks:
+- ceph:
+- cfuse: [client.0]
+- autotest:
+    client.0: [dbench]

diff --git a/collections/basic/tasks/cfuse_workunit_kernel_untar_build.yaml b/collections/basic/tasks/cfuse_workunit_kernel_untar_build.yaml
new file mode 100644 (file)
index 0000000..40a6395
--- /dev/null
+++ b/collections/basic/tasks/cfuse_workunit_kernel_untar_build.yaml
@@ -0,0 +1,6 @@
+tasks:
+- ceph:
+- cfuse: [client.0]
+- workunit:
+    client.0:
+      - kernel_untar_build.sh

diff --git a/collections/basic/tasks/cfuse_workunit_misc.yaml b/collections/basic/tasks/cfuse_workunit_misc.yaml
new file mode 100644 (file)
index 0000000..1b83768
--- /dev/null
+++ b/collections/basic/tasks/cfuse_workunit_misc.yaml
@@ -0,0 +1,6 @@
+tasks:
+- ceph:
+- cfuse: [client.0]
+- workunit:
+    client.0:
+      - misc
\ No newline at end of file

diff --git a/collections/basic/tasks/cfuse_workunit_snaps.yaml b/collections/basic/tasks/cfuse_workunit_snaps.yaml
new file mode 100644 (file)
index 0000000..66fe741
--- /dev/null
+++ b/collections/basic/tasks/cfuse_workunit_snaps.yaml
@@ -0,0 +1,6 @@
+tasks:
+- ceph:
+- cfuse: [client.0]
+- workunit:
+    client.0:
+      - snaps
\ No newline at end of file

diff --git a/collections/basic/tasks/cfuse_workunit_suites_blogbench.yaml b/collections/basic/tasks/cfuse_workunit_suites_blogbench.yaml
new file mode 100644 (file)
index 0000000..29c1142
--- /dev/null
+++ b/collections/basic/tasks/cfuse_workunit_suites_blogbench.yaml
@@ -0,0 +1,6 @@
+tasks:
+- ceph:
+- cfuse: [client.0]
+- workunit:
+    client.0:
+      - suites/blogbench.sh
\ No newline at end of file

diff --git a/collections/basic/tasks/cfuse_workunit_suites_dbench.yaml b/collections/basic/tasks/cfuse_workunit_suites_dbench.yaml
new file mode 100644 (file)
index 0000000..f2c96a6
--- /dev/null
+++ b/collections/basic/tasks/cfuse_workunit_suites_dbench.yaml
@@ -0,0 +1,6 @@
+tasks:
+- ceph:
+- cfuse: [client.0]
+- workunit:
+    client.0:
+      - suites/dbench.sh
\ No newline at end of file

diff --git a/collections/basic/tasks/cfuse_workunit_suites_ffsb.yaml b/collections/basic/tasks/cfuse_workunit_suites_ffsb.yaml
new file mode 100644 (file)
index 0000000..071a128
--- /dev/null
+++ b/collections/basic/tasks/cfuse_workunit_suites_ffsb.yaml
@@ -0,0 +1,6 @@
+tasks:
+- ceph:
+- cfuse: [client.0]
+- workunit:
+    client.0:
+      - suites/ffsb.sh
\ No newline at end of file

diff --git a/collections/basic/tasks/cfuse_workunit_suites_fsstress.yaml b/collections/basic/tasks/cfuse_workunit_suites_fsstress.yaml
new file mode 100644 (file)
index 0000000..cdbf9a8
--- /dev/null
+++ b/collections/basic/tasks/cfuse_workunit_suites_fsstress.yaml
@@ -0,0 +1,6 @@
+tasks:
+- ceph:
+- cfuse: [client.0]
+- workunit:
+    client.0:
+      - suites/fsstress.sh
\ No newline at end of file

diff --git a/collections/basic/tasks/cfuse_workunit_suites_iozone.yaml b/collections/basic/tasks/cfuse_workunit_suites_iozone.yaml
new file mode 100644 (file)
index 0000000..ec0ca97
--- /dev/null
+++ b/collections/basic/tasks/cfuse_workunit_suites_iozone.yaml
@@ -0,0 +1,6 @@
+tasks:
+- ceph:
+- cfuse: [client.0]
+- workunit:
+    client.0:
+      - suites/iozone.sh
\ No newline at end of file

diff --git a/collections/basic/tasks/cfuse_workunit_suites_pjd.yaml b/collections/basic/tasks/cfuse_workunit_suites_pjd.yaml
new file mode 100644 (file)
index 0000000..4555511
--- /dev/null
+++ b/collections/basic/tasks/cfuse_workunit_suites_pjd.yaml
@@ -0,0 +1,6 @@
+tasks:
+- ceph:
+- cfuse: [client.0]
+- workunit:
+    client.0:
+      - suites/pjd.sh
\ No newline at end of file

diff --git a/collections/basic/tasks/cfuse_workunit_suites_tiobench.yaml b/collections/basic/tasks/cfuse_workunit_suites_tiobench.yaml
new file mode 100644 (file)
index 0000000..d1b2397
--- /dev/null
+++ b/collections/basic/tasks/cfuse_workunit_suites_tiobench.yaml
@@ -0,0 +1,6 @@
+tasks:
+- ceph:
+- cfuse: [client.0]
+- workunit:
+    client.0:
+      - suites/tiobench.sh
\ No newline at end of file

diff --git a/collections/basic/tasks/cfuse_workunit_trivial_sync.yaml b/collections/basic/tasks/cfuse_workunit_trivial_sync.yaml
new file mode 100644 (file)
index 0000000..2d9da8f
--- /dev/null
+++ b/collections/basic/tasks/cfuse_workunit_trivial_sync.yaml
@@ -0,0 +1,5 @@
+tasks:
+- ceph:
+- cfuse: [client.0]
+- workunit:
+    client.0: [misc/trivial_sync.sh]

diff --git a/collections/basic/tasks/kclient_dbench.yaml b/collections/basic/tasks/kclient_dbench.yaml
new file mode 100644 (file)
index 0000000..17f5aac
--- /dev/null
+++ b/collections/basic/tasks/kclient_dbench.yaml
@@ -0,0 +1,5 @@
+tasks:
+- ceph:
+- kclient: [client.0]
+- autotest:
+    client.0: [dbench]

diff --git a/collections/basic/tasks/kclient_workunit_direct_io.yaml b/collections/basic/tasks/kclient_workunit_direct_io.yaml
new file mode 100644 (file)
index 0000000..7aa9107
--- /dev/null
+++ b/collections/basic/tasks/kclient_workunit_direct_io.yaml
@@ -0,0 +1,7 @@
+tasks:
+- ceph:
+- kclient: [client.0]
+- workunit:
+    client.0:
+      - direct_io
+

diff --git a/collections/basic/tasks/kclient_workunit_kclient.yaml b/collections/basic/tasks/kclient_workunit_kclient.yaml
new file mode 100644 (file)
index 0000000..df2f4cd
--- /dev/null
+++ b/collections/basic/tasks/kclient_workunit_kclient.yaml
@@ -0,0 +1,5 @@
+tasks:
+- ceph:
+- kclient: [client.0]
+- workunit:
+    client.0: [kclient]

diff --git a/collections/basic/tasks/kclient_workunit_kernel_untar_build.yaml b/collections/basic/tasks/kclient_workunit_kernel_untar_build.yaml
new file mode 100644 (file)
index 0000000..bae47e2
--- /dev/null
+++ b/collections/basic/tasks/kclient_workunit_kernel_untar_build.yaml
@@ -0,0 +1,6 @@
+tasks:
+- ceph:
+- kclient: [client.0]
+- workunit:
+    client.0:
+      - kernel_untar_build.sh
\ No newline at end of file

diff --git a/collections/basic/tasks/kclient_workunit_misc.yaml b/collections/basic/tasks/kclient_workunit_misc.yaml
new file mode 100644 (file)
index 0000000..8196fcf
--- /dev/null
+++ b/collections/basic/tasks/kclient_workunit_misc.yaml
@@ -0,0 +1,6 @@
+tasks:
+- ceph:
+- kclient: [client.0]
+- workunit:
+    client.0:
+      - misc
\ No newline at end of file

diff --git a/collections/basic/tasks/kclient_workunit_trivial_sync.yaml b/collections/basic/tasks/kclient_workunit_trivial_sync.yaml
new file mode 100644 (file)
index 0000000..bff47a9
--- /dev/null
+++ b/collections/basic/tasks/kclient_workunit_trivial_sync.yaml
@@ -0,0 +1,5 @@
+tasks:
+- ceph:
+- kclient: [client.0]
+- workunit:
+    client.0: [misc/trivial_sync.sh]

diff --git a/collections/basic/tasks/rbd_dbench.yaml b/collections/basic/tasks/rbd_dbench.yaml
new file mode 100644 (file)
index 0000000..398273e
--- /dev/null
+++ b/collections/basic/tasks/rbd_dbench.yaml
@@ -0,0 +1,5 @@
+tasks:
+- ceph:
+- rbd: [client.0]
+- autotest:
+    client.0: [dbench]

diff --git a/collections/basic/tasks/rbd_workunit_kernel_untar_build.yaml b/collections/basic/tasks/rbd_workunit_kernel_untar_build.yaml
new file mode 100644 (file)
index 0000000..270af35
--- /dev/null
+++ b/collections/basic/tasks/rbd_workunit_kernel_untar_build.yaml
@@ -0,0 +1,6 @@
+tasks:
+- ceph:
+- rbd: [client.0]
+- workunit:
+    client.0:
+      - kernel_untar_build.sh

diff --git a/collections/basic/tasks/rbd_workunit_suites_ffsb.yaml b/collections/basic/tasks/rbd_workunit_suites_ffsb.yaml
new file mode 100644 (file)
index 0000000..ff5c5ff
--- /dev/null
+++ b/collections/basic/tasks/rbd_workunit_suites_ffsb.yaml
@@ -0,0 +1,6 @@
+tasks:
+- ceph:
+- rbd: [client.0]
+- workunit:
+    client.0:
+      - suites/ffsb.sh

diff --git a/collections/basic/tasks/rbd_workunit_suites_fsstress.yaml b/collections/basic/tasks/rbd_workunit_suites_fsstress.yaml
new file mode 100644 (file)
index 0000000..2134108
--- /dev/null
+++ b/collections/basic/tasks/rbd_workunit_suites_fsstress.yaml
@@ -0,0 +1,6 @@
+tasks:
+- ceph:
+- rbd: [client.0]
+- workunit:
+    client.0:
+      - suites/fsstress.sh

diff --git a/collections/basic/tasks/rbd_workunit_suites_iozone.yaml b/collections/basic/tasks/rbd_workunit_suites_iozone.yaml
new file mode 100644 (file)
index 0000000..8652d8d
--- /dev/null
+++ b/collections/basic/tasks/rbd_workunit_suites_iozone.yaml
@@ -0,0 +1,6 @@
+tasks:
+- ceph:
+- rbd: [client.0]
+- workunit:
+    client.0:
+      - suites/iozone.sh

diff --git a/collections/basic/tasks/rbd_workunit_suites_tiobench.yaml b/collections/basic/tasks/rbd_workunit_suites_tiobench.yaml
new file mode 100644 (file)
index 0000000..f60e232
--- /dev/null
+++ b/collections/basic/tasks/rbd_workunit_suites_tiobench.yaml
@@ -0,0 +1,6 @@
+tasks:
+- ceph:
+- rbd: [client.0]
+- workunit:
+    client.0:
+      - suites/tiobench.sh

diff --git a/collections/basic/tasks/rbd_workunit_trivial_sync.yaml b/collections/basic/tasks/rbd_workunit_trivial_sync.yaml
new file mode 100644 (file)
index 0000000..252f342
--- /dev/null
+++ b/collections/basic/tasks/rbd_workunit_trivial_sync.yaml
@@ -0,0 +1,6 @@
+tasks:
+- ceph:
+- rbd:
+    client.0:
+- workunit:
+    client.0: [misc/trivial_sync.sh]

diff --git a/collections/basic/tasks/rgw_s3tests.yaml b/collections/basic/tasks/rgw_s3tests.yaml
new file mode 100644 (file)
index 0000000..95936a3
--- /dev/null
+++ b/collections/basic/tasks/rgw_s3tests.yaml
@@ -0,0 +1,7 @@
+tasks:
+- ceph:
+- rgw: [client.0]
+- s3tests:
+    client.0:
+      rgw_server: client.0
+      extra_args: ['--exclude', 'test_logging_toggle']

diff --git a/tasks/cfuse_dbench.yaml b/tasks/cfuse_dbench.yaml
deleted file mode 100644 (file)
index 63b5efb..0000000
--- a/tasks/cfuse_dbench.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- ceph:
-- cfuse: [client.0]
-- autotest:
-    client.0: [dbench]

diff --git a/tasks/cfuse_workunit_kernel_untar_build.yaml b/tasks/cfuse_workunit_kernel_untar_build.yaml
deleted file mode 100644 (file)
index 40a6395..0000000
--- a/tasks/cfuse_workunit_kernel_untar_build.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- ceph:
-- cfuse: [client.0]
-- workunit:
-    client.0:
-      - kernel_untar_build.sh

diff --git a/tasks/cfuse_workunit_misc.yaml b/tasks/cfuse_workunit_misc.yaml
deleted file mode 100644 (file)
index 1b83768..0000000
--- a/tasks/cfuse_workunit_misc.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- ceph:
-- cfuse: [client.0]
-- workunit:
-    client.0:
-      - misc
\ No newline at end of file

diff --git a/tasks/cfuse_workunit_snaps.yaml b/tasks/cfuse_workunit_snaps.yaml
deleted file mode 100644 (file)
index 66fe741..0000000
--- a/tasks/cfuse_workunit_snaps.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- ceph:
-- cfuse: [client.0]
-- workunit:
-    client.0:
-      - snaps
\ No newline at end of file

diff --git a/tasks/cfuse_workunit_suites_blogbench.yaml b/tasks/cfuse_workunit_suites_blogbench.yaml
deleted file mode 100644 (file)
index 29c1142..0000000
--- a/tasks/cfuse_workunit_suites_blogbench.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- ceph:
-- cfuse: [client.0]
-- workunit:
-    client.0:
-      - suites/blogbench.sh
\ No newline at end of file

diff --git a/tasks/cfuse_workunit_suites_dbench.yaml b/tasks/cfuse_workunit_suites_dbench.yaml
deleted file mode 100644 (file)
index f2c96a6..0000000
--- a/tasks/cfuse_workunit_suites_dbench.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- ceph:
-- cfuse: [client.0]
-- workunit:
-    client.0:
-      - suites/dbench.sh
\ No newline at end of file

diff --git a/tasks/cfuse_workunit_suites_ffsb.yaml b/tasks/cfuse_workunit_suites_ffsb.yaml
deleted file mode 100644 (file)
index 071a128..0000000
--- a/tasks/cfuse_workunit_suites_ffsb.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- ceph:
-- cfuse: [client.0]
-- workunit:
-    client.0:
-      - suites/ffsb.sh
\ No newline at end of file

diff --git a/tasks/cfuse_workunit_suites_fsstress.yaml b/tasks/cfuse_workunit_suites_fsstress.yaml
deleted file mode 100644 (file)
index cdbf9a8..0000000
--- a/tasks/cfuse_workunit_suites_fsstress.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- ceph:
-- cfuse: [client.0]
-- workunit:
-    client.0:
-      - suites/fsstress.sh
\ No newline at end of file

diff --git a/tasks/cfuse_workunit_suites_iozone.yaml b/tasks/cfuse_workunit_suites_iozone.yaml
deleted file mode 100644 (file)
index ec0ca97..0000000
--- a/tasks/cfuse_workunit_suites_iozone.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- ceph:
-- cfuse: [client.0]
-- workunit:
-    client.0:
-      - suites/iozone.sh
\ No newline at end of file

diff --git a/tasks/cfuse_workunit_suites_pjd.yaml b/tasks/cfuse_workunit_suites_pjd.yaml
deleted file mode 100644 (file)
index 4555511..0000000
--- a/tasks/cfuse_workunit_suites_pjd.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- ceph:
-- cfuse: [client.0]
-- workunit:
-    client.0:
-      - suites/pjd.sh
\ No newline at end of file

diff --git a/tasks/cfuse_workunit_suites_tiobench.yaml b/tasks/cfuse_workunit_suites_tiobench.yaml
deleted file mode 100644 (file)
index d1b2397..0000000
--- a/tasks/cfuse_workunit_suites_tiobench.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- ceph:
-- cfuse: [client.0]
-- workunit:
-    client.0:
-      - suites/tiobench.sh
\ No newline at end of file

diff --git a/tasks/cfuse_workunit_trivial_sync.yaml b/tasks/cfuse_workunit_trivial_sync.yaml
deleted file mode 100644 (file)
index 2d9da8f..0000000
--- a/tasks/cfuse_workunit_trivial_sync.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- ceph:
-- cfuse: [client.0]
-- workunit:
-    client.0: [misc/trivial_sync.sh]

diff --git a/tasks/kclient_dbench.yaml b/tasks/kclient_dbench.yaml
deleted file mode 100644 (file)
index 17f5aac..0000000
--- a/tasks/kclient_dbench.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- ceph:
-- kclient: [client.0]
-- autotest:
-    client.0: [dbench]

diff --git a/tasks/kclient_workunit_direct_io.yaml b/tasks/kclient_workunit_direct_io.yaml
deleted file mode 100644 (file)
index 7aa9107..0000000
--- a/tasks/kclient_workunit_direct_io.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- ceph:
-- kclient: [client.0]
-- workunit:
-    client.0:
-      - direct_io
-

diff --git a/tasks/kclient_workunit_kclient.yaml b/tasks/kclient_workunit_kclient.yaml
deleted file mode 100644 (file)
index df2f4cd..0000000
--- a/tasks/kclient_workunit_kclient.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- ceph:
-- kclient: [client.0]
-- workunit:
-    client.0: [kclient]

diff --git a/tasks/kclient_workunit_kernel_untar_build.yaml b/tasks/kclient_workunit_kernel_untar_build.yaml
deleted file mode 100644 (file)
index bae47e2..0000000
--- a/tasks/kclient_workunit_kernel_untar_build.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- ceph:
-- kclient: [client.0]
-- workunit:
-    client.0:
-      - kernel_untar_build.sh
\ No newline at end of file

diff --git a/tasks/kclient_workunit_misc.yaml b/tasks/kclient_workunit_misc.yaml
deleted file mode 100644 (file)
index 8196fcf..0000000
--- a/tasks/kclient_workunit_misc.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- ceph:
-- kclient: [client.0]
-- workunit:
-    client.0:
-      - misc
\ No newline at end of file

diff --git a/tasks/kclient_workunit_trivial_sync.yaml b/tasks/kclient_workunit_trivial_sync.yaml
deleted file mode 100644 (file)
index bff47a9..0000000
--- a/tasks/kclient_workunit_trivial_sync.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- ceph:
-- kclient: [client.0]
-- workunit:
-    client.0: [misc/trivial_sync.sh]

diff --git a/tasks/rbd_dbench.yaml b/tasks/rbd_dbench.yaml
deleted file mode 100644 (file)
index 398273e..0000000
--- a/tasks/rbd_dbench.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- ceph:
-- rbd: [client.0]
-- autotest:
-    client.0: [dbench]

diff --git a/tasks/rbd_workunit_kernel_untar_build.yaml b/tasks/rbd_workunit_kernel_untar_build.yaml
deleted file mode 100644 (file)
index 270af35..0000000
--- a/tasks/rbd_workunit_kernel_untar_build.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- ceph:
-- rbd: [client.0]
-- workunit:
-    client.0:
-      - kernel_untar_build.sh

diff --git a/tasks/rbd_workunit_suites_ffsb.yaml b/tasks/rbd_workunit_suites_ffsb.yaml
deleted file mode 100644 (file)
index ff5c5ff..0000000
--- a/tasks/rbd_workunit_suites_ffsb.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- ceph:
-- rbd: [client.0]
-- workunit:
-    client.0:
-      - suites/ffsb.sh

diff --git a/tasks/rbd_workunit_suites_fsstress.yaml b/tasks/rbd_workunit_suites_fsstress.yaml
deleted file mode 100644 (file)
index 2134108..0000000
--- a/tasks/rbd_workunit_suites_fsstress.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- ceph:
-- rbd: [client.0]
-- workunit:
-    client.0:
-      - suites/fsstress.sh

diff --git a/tasks/rbd_workunit_suites_iozone.yaml b/tasks/rbd_workunit_suites_iozone.yaml
deleted file mode 100644 (file)
index 8652d8d..0000000
--- a/tasks/rbd_workunit_suites_iozone.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- ceph:
-- rbd: [client.0]
-- workunit:
-    client.0:
-      - suites/iozone.sh

diff --git a/tasks/rbd_workunit_suites_tiobench.yaml b/tasks/rbd_workunit_suites_tiobench.yaml
deleted file mode 100644 (file)
index f60e232..0000000
--- a/tasks/rbd_workunit_suites_tiobench.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- ceph:
-- rbd: [client.0]
-- workunit:
-    client.0:
-      - suites/tiobench.sh

diff --git a/tasks/rbd_workunit_trivial_sync.yaml b/tasks/rbd_workunit_trivial_sync.yaml
deleted file mode 100644 (file)
index 252f342..0000000
--- a/tasks/rbd_workunit_trivial_sync.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- ceph:
-- rbd:
-    client.0:
-- workunit:
-    client.0: [misc/trivial_sync.sh]

diff --git a/tasks/rgw_s3tests.yaml b/tasks/rgw_s3tests.yaml
deleted file mode 100644 (file)
index 95936a3..0000000
--- a/tasks/rgw_s3tests.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- ceph:
-- rgw: [client.0]
-- s3tests:
-    client.0:
-      rgw_server: client.0
-      extra_args: ['--exclude', 'test_logging_toggle']