Move collections into separate suites

For now, there are just two suites:
  * regression - tests that should always pass
  * stress     - tests that have problems for one reason or another

diff --git a/README b/README
index f72bed6554f453eb5b3985c414dca6a0e119afb5..2e99fa12a23e968d04e8b25469c902d41b74b495 100644 (file)
--- a/README
+++ b/README
@@ -2,30 +2,29 @@ ceph-qa-suite
 -------------
 
 clusters/    - some predefined cluster layouts
-tasks/       - some predefined task fragments
-collections/ - collections of tests to actually run
+suites/      - sets of collections
 
-We have several collections, each a subdirectory within collections/.
+We have several collections, each a subdirectory within suites/*/.
 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.
 
 For example, given the files
 
-  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
+  suite/collection/
+  suite/collection/foo/
+  suite/collection/foo/clusters/
+  suite/collection/foo/clusters/fixed-3.yaml
+  suite/collection/foo/clusters/fixed-9.yaml
+  suite/collection/foo/tasks/
+  suite/collection/foo/tasks/a
+  suite/collection/foo/tasks/b
+  suite/collection/foo/tasks/c
+  suite/collection/bar/
+  suite/collection/bar/clusters/fixed-3.yaml
+  suite/collection/bar/tasks/
+  suite/collection/bar/tasks/d
+  suite/collection/bar/tasks/e
 
 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
@@ -38,6 +37,5 @@ result (optionally combined with any additional fragments passed on
 the command line).
 
 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.
+the top-level clusters/ (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
deleted file mode 120000 (symlink)
index 19a55d2..0000000
--- a/collections/basic/clusters/fixed-3.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../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
deleted file mode 100644 (file)
index 05cbf54..0000000
--- a/collections/basic/tasks/cfuse_dbench.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- ceph:
-- cfuse:
-- autotest:
-    all: [dbench]

diff --git a/collections/basic/tasks/cfuse_workunit_kernel_untar_build.yaml b/collections/basic/tasks/cfuse_workunit_kernel_untar_build.yaml
deleted file mode 100644 (file)
index becbbfd..0000000
--- a/collections/basic/tasks/cfuse_workunit_kernel_untar_build.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- ceph:
-- cfuse:
-- workunit:
-    all:
-      - kernel_untar_build.sh

diff --git a/collections/basic/tasks/cfuse_workunit_misc.yaml b/collections/basic/tasks/cfuse_workunit_misc.yaml
deleted file mode 100644 (file)
index 7a08aab..0000000
--- a/collections/basic/tasks/cfuse_workunit_misc.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- ceph:
-- cfuse:
-- workunit:
-    all:
-      - misc

diff --git a/collections/basic/tasks/cfuse_workunit_snaps.yaml b/collections/basic/tasks/cfuse_workunit_snaps.yaml
deleted file mode 100644 (file)
index ec7ef0a..0000000
--- a/collections/basic/tasks/cfuse_workunit_snaps.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- ceph:
-- cfuse:
-- workunit:
-    all:
-      - snaps

diff --git a/collections/basic/tasks/cfuse_workunit_suites_blogbench.yaml b/collections/basic/tasks/cfuse_workunit_suites_blogbench.yaml
deleted file mode 100644 (file)
index 03bb880..0000000
--- a/collections/basic/tasks/cfuse_workunit_suites_blogbench.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- ceph:
-- cfuse:
-- workunit:
-    all:
-      - suites/blogbench.sh

diff --git a/collections/basic/tasks/cfuse_workunit_suites_dbench.yaml b/collections/basic/tasks/cfuse_workunit_suites_dbench.yaml
deleted file mode 100644 (file)
index cc3c65b..0000000
--- a/collections/basic/tasks/cfuse_workunit_suites_dbench.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- ceph:
-- cfuse:
-- workunit:
-    all:
-      - suites/dbench.sh

diff --git a/collections/basic/tasks/cfuse_workunit_suites_ffsb.yaml b/collections/basic/tasks/cfuse_workunit_suites_ffsb.yaml
deleted file mode 100644 (file)
index 966b329..0000000
--- a/collections/basic/tasks/cfuse_workunit_suites_ffsb.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- ceph:
-- cfuse:
-- workunit:
-    all:
-      - suites/ffsb.sh

diff --git a/collections/basic/tasks/cfuse_workunit_suites_fsstress.yaml b/collections/basic/tasks/cfuse_workunit_suites_fsstress.yaml
deleted file mode 100644 (file)
index bb38946..0000000
--- a/collections/basic/tasks/cfuse_workunit_suites_fsstress.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- ceph:
-- cfuse:
-- workunit:
-    all:
-      - suites/fsstress.sh

diff --git a/collections/basic/tasks/cfuse_workunit_suites_fsx.yaml b/collections/basic/tasks/cfuse_workunit_suites_fsx.yaml
deleted file mode 100644 (file)
index 08bd680..0000000
--- a/collections/basic/tasks/cfuse_workunit_suites_fsx.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- ceph:
-- cfuse:
-- workunit:
-    all:
-      - suites/fsx.sh

diff --git a/collections/basic/tasks/cfuse_workunit_suites_iozone.yaml b/collections/basic/tasks/cfuse_workunit_suites_iozone.yaml
deleted file mode 100644 (file)
index 5052f8d..0000000
--- a/collections/basic/tasks/cfuse_workunit_suites_iozone.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- ceph:
-- cfuse: [client.0]
-- workunit:
-    all:
-      - 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
deleted file mode 100644 (file)
index 21ffd09..0000000
--- a/collections/basic/tasks/cfuse_workunit_suites_pjd.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- ceph:
-- cfuse:
-- workunit:
-    all:
-      - suites/pjd.sh

diff --git a/collections/basic/tasks/cfuse_workunit_suites_tiobench.yaml b/collections/basic/tasks/cfuse_workunit_suites_tiobench.yaml
deleted file mode 100644 (file)
index 326de71..0000000
--- a/collections/basic/tasks/cfuse_workunit_suites_tiobench.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- ceph:
-- cfuse:
-- workunit:
-    all:
-      - suites/tiobench.sh

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

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

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

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

diff --git a/collections/basic/tasks/kclient_workunit_kernel_untar_build.yaml b/collections/basic/tasks/kclient_workunit_kernel_untar_build.yaml
deleted file mode 100644 (file)
index 63c0edd..0000000
--- a/collections/basic/tasks/kclient_workunit_kernel_untar_build.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- ceph:
-- kclient:
-- workunit:
-    all:
-      - kernel_untar_build.sh

diff --git a/collections/basic/tasks/kclient_workunit_misc.yaml b/collections/basic/tasks/kclient_workunit_misc.yaml
deleted file mode 100644 (file)
index e3b08a5..0000000
--- a/collections/basic/tasks/kclient_workunit_misc.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- ceph:
-- kclient:
-- workunit:
-    all:
-      - misc

diff --git a/collections/basic/tasks/kclient_workunit_suites_blogbench.yaml b/collections/basic/tasks/kclient_workunit_suites_blogbench.yaml
deleted file mode 100644 (file)
index 4da1217..0000000
--- a/collections/basic/tasks/kclient_workunit_suites_blogbench.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- ceph:
-- kclient:
-- workunit:
-    all:
-      - suites/blogbench.sh

diff --git a/collections/basic/tasks/kclient_workunit_suites_ffsb.yaml b/collections/basic/tasks/kclient_workunit_suites_ffsb.yaml
deleted file mode 100644 (file)
index 2763738..0000000
--- a/collections/basic/tasks/kclient_workunit_suites_ffsb.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- ceph:
-- kclient:
-- workunit:
-    all:
-      - suites/ffsb.sh

diff --git a/collections/basic/tasks/kclient_workunit_suites_fsstress.yaml b/collections/basic/tasks/kclient_workunit_suites_fsstress.yaml
deleted file mode 100644 (file)
index dbadd76..0000000
--- a/collections/basic/tasks/kclient_workunit_suites_fsstress.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- ceph:
-- kclient:
-- workunit:
-    all:
-      - suites/fsstress.sh

diff --git a/collections/basic/tasks/kclient_workunit_suites_fsx.yaml b/collections/basic/tasks/kclient_workunit_suites_fsx.yaml
deleted file mode 100644 (file)
index 98862e1..0000000
--- a/collections/basic/tasks/kclient_workunit_suites_fsx.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- ceph:
-- kclient:
-- workunit:
-    all:
-      - suites/fsx.sh

diff --git a/collections/basic/tasks/kclient_workunit_suites_iozone.yaml b/collections/basic/tasks/kclient_workunit_suites_iozone.yaml
deleted file mode 100644 (file)
index 5e3d985..0000000
--- a/collections/basic/tasks/kclient_workunit_suites_iozone.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- ceph:
-- kclient:
-- workunit:
-    all:
-      - suites/iozone.sh

diff --git a/collections/basic/tasks/kclient_workunit_suites_pjd.yaml b/collections/basic/tasks/kclient_workunit_suites_pjd.yaml
deleted file mode 100644 (file)
index 2f3e4a9..0000000
--- a/collections/basic/tasks/kclient_workunit_suites_pjd.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- ceph:
-- kclient:
-- workunit:
-    all:
-      - suites/pjd.sh

diff --git a/collections/basic/tasks/kclient_workunit_suites_tiobench.yaml b/collections/basic/tasks/kclient_workunit_suites_tiobench.yaml
deleted file mode 100644 (file)
index acdb47a..0000000
--- a/collections/basic/tasks/kclient_workunit_suites_tiobench.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- ceph:
-- kclient:
-- workunit:
-    all:
-      - suites/tiobench.sh

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

diff --git a/collections/basic/tasks/libcephfs_interface_tests.yaml b/collections/basic/tasks/libcephfs_interface_tests.yaml
deleted file mode 100644 (file)
index c2b19f1..0000000
--- a/collections/basic/tasks/libcephfs_interface_tests.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- ceph:
-- cfuse:
-- workunit:
-    client.0:
-      - libcephfs/test.sh

diff --git a/collections/basic/tasks/rados_api_tests.yaml b/collections/basic/tasks/rados_api_tests.yaml
deleted file mode 100644 (file)
index 2b3df4e..0000000
--- a/collections/basic/tasks/rados_api_tests.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- ceph:
-- cfuse:
-- workunit:
-    client.0:
-      - rados/test.sh

diff --git a/collections/basic/tasks/rados_python.yaml b/collections/basic/tasks/rados_python.yaml
deleted file mode 100644 (file)
index bccc75a..0000000
--- a/collections/basic/tasks/rados_python.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- ceph:
-- cfuse:
-- workunit:
-    client.0:
-      - rados/test_python.sh

diff --git a/collections/basic/tasks/rbd_api_tests.yaml b/collections/basic/tasks/rbd_api_tests.yaml
deleted file mode 100644 (file)
index 6e4d422..0000000
--- a/collections/basic/tasks/rbd_api_tests.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- ceph:
-- cfuse:
-- workunit:
-    client.0:
-      - rbd/test_librbd.sh

diff --git a/collections/basic/tasks/rbd_cli_copy.yaml b/collections/basic/tasks/rbd_cli_copy.yaml
deleted file mode 100644 (file)
index bc6d0e3..0000000
--- a/collections/basic/tasks/rbd_cli_copy.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- ceph:
-- cfuse:
-- workunit:
-    client.0:
-      - rbd/copy.sh

diff --git a/collections/basic/tasks/rbd_cli_import_export.yaml b/collections/basic/tasks/rbd_cli_import_export.yaml
deleted file mode 100644 (file)
index 8e031d1..0000000
--- a/collections/basic/tasks/rbd_cli_import_export.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- ceph:
-- cfuse:
-- workunit:
-    client.0:
-      - rbd/import_export.sh

diff --git a/collections/basic/tasks/rbd_dbench.yaml b/collections/basic/tasks/rbd_dbench.yaml
deleted file mode 100644 (file)
index e98c20e..0000000
--- a/collections/basic/tasks/rbd_dbench.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- ceph:
-- rbd:
-    all:
-- autotest:
-    all: [dbench]

diff --git a/collections/basic/tasks/rbd_python_api_tests.yaml b/collections/basic/tasks/rbd_python_api_tests.yaml
deleted file mode 100644 (file)
index 110bd21..0000000
--- a/collections/basic/tasks/rbd_python_api_tests.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- ceph:
-- cfuse:
-- workunit:
-    client.0:
-      - rbd/test_librbd_python.sh

diff --git a/collections/basic/tasks/rbd_workunit_kernel_untar_build.yaml b/collections/basic/tasks/rbd_workunit_kernel_untar_build.yaml
deleted file mode 100644 (file)
index 7dae1e7..0000000
--- a/collections/basic/tasks/rbd_workunit_kernel_untar_build.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- ceph:
-- rbd:
-    all:
-- workunit:
-    all:
-      - kernel_untar_build.sh

diff --git a/collections/basic/tasks/rbd_workunit_suites_ffsb.yaml b/collections/basic/tasks/rbd_workunit_suites_ffsb.yaml
deleted file mode 100644 (file)
index 9a276ae..0000000
--- a/collections/basic/tasks/rbd_workunit_suites_ffsb.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-tasks:
-- ceph:
-- rbd:
-    all:
-      image_size: 20480
-- workunit:
-    all:
-      - suites/ffsb.sh

diff --git a/collections/basic/tasks/rbd_workunit_suites_fsstress.yaml b/collections/basic/tasks/rbd_workunit_suites_fsstress.yaml
deleted file mode 100644 (file)
index 062b07c..0000000
--- a/collections/basic/tasks/rbd_workunit_suites_fsstress.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- ceph:
-- rbd:
-    all:
-- workunit:
-    all:
-      - suites/fsstress.sh

diff --git a/collections/basic/tasks/rbd_workunit_suites_fsx.yaml b/collections/basic/tasks/rbd_workunit_suites_fsx.yaml
deleted file mode 100644 (file)
index 9269f43..0000000
--- a/collections/basic/tasks/rbd_workunit_suites_fsx.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- ceph:
-- rbd:
-    all:
-- workunit:
-    all:
-      - suites/fsx.sh

diff --git a/collections/basic/tasks/rbd_workunit_suites_iozone.yaml b/collections/basic/tasks/rbd_workunit_suites_iozone.yaml
deleted file mode 100644 (file)
index 4578ac5..0000000
--- a/collections/basic/tasks/rbd_workunit_suites_iozone.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-tasks:
-- ceph:
-- rbd:
-    all:
-      image_size: 20480
-- workunit:
-    all:
-      - suites/iozone.sh

diff --git a/collections/basic/tasks/rbd_workunit_suites_tiobench.yaml b/collections/basic/tasks/rbd_workunit_suites_tiobench.yaml
deleted file mode 100644 (file)
index 3940102..0000000
--- a/collections/basic/tasks/rbd_workunit_suites_tiobench.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- ceph:
-- rbd:
-    all:
-- workunit:
-    all:
-      - suites/tiobench.sh

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

diff --git a/collections/basic/tasks/rgw_s3tests.yaml b/collections/basic/tasks/rgw_s3tests.yaml
deleted file mode 100644 (file)
index 13d265d..0000000
--- a/collections/basic/tasks/rgw_s3tests.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- ceph:
-- rgw: [client.0]
-- s3tests:
-    client.0:
-      rgw_server: client.0

diff --git a/collections/multiclient/clusters/two_clients.yaml b/collections/multiclient/clusters/two_clients.yaml
deleted file mode 100644 (file)
index 5c9f166..0000000
--- a/collections/multiclient/clusters/two_clients.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-roles:
-- [mon.0, mds.0, osd.0, osd.1]
-- [mon.1, client.1]
-- [mon.2, client.0]

diff --git a/collections/multiclient/tasks/locking.yaml b/collections/multiclient/tasks/locking.yaml
deleted file mode 100644 (file)
index 71966d5..0000000
--- a/collections/multiclient/tasks/locking.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-kernel:
-tasks:
-- ceph:
-- kclient:
-- lockfile: [{client: client.0, lockfile: testfile, holdtime: 5, maxwait: 6},
-             {client: client.1, lockfile: testfile, holdtime: 5, maxwait: 12},
-             {client: client.1, lockfile: testfile, holdtime: 0, maxwait: 3, expectfail: True},
-             20,
-             {client: client.0, lockfile: testfile, holdtime: 5, maxwait: 15},
-             {client: client.1, lockfile: testfile, holdtime: 5, maxwait: 3, expectfail: True},
-             {client: client.1, lockfile: testfile, holdtime: 5, maxwait: 15}]

diff --git a/collections/multiclient/tasks/locking2.yaml b/collections/multiclient/tasks/locking2.yaml
deleted file mode 100644 (file)
index 33f8a52..0000000
--- a/collections/multiclient/tasks/locking2.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-kernel:
-tasks:
-- ceph:
-- kclient:
-- lockfile: [{client: client.0, lockfile: testfile, holdtime: 4, maxwait: 5, offset: 0, length: 5},
-             {client: client.1, lockfile: testfile, holdtime: 4, maxwait: 5, offset: 10, length: 1},
-             {client: client.1, lockfile: testfile, holdtime: 2, maxwait: 4, offset: 0, length: 15, expectfail: True},
-             {client: client.1, lockfile: testfile, holdtime: 4, maxwait: 10, offset: 0, length: 15},
-             10,
-             {client: client.0, lockfile: testfile, holdtime: 3, maxwait: 4, offset: 0, length: 15}]

diff --git a/collections/multiclient/tasks/locktest.yaml b/collections/multiclient/tasks/locktest.yaml
deleted file mode 100644 (file)
index 255bbaf..0000000
--- a/collections/multiclient/tasks/locktest.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-tasks:
-- ceph:
-- kclient:
-- locktest: [client.0, client.1]

diff --git a/collections/multimds/clusters/7-multimds.yaml b/collections/multimds/clusters/7-multimds.yaml
deleted file mode 100644 (file)
index 17cfd7b..0000000
--- a/collections/multimds/clusters/7-multimds.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-roles:
-- [mon.a, mds.a, mds.a-s]
-- [mon.b, mds.b, mds.b-s]
-- [mon.c, mds.c, mds.c-s]
-- [osd.0]
-- [osd.1]
-- [osd.2]
-- [client.0]

diff --git a/collections/multimds/tasks/fsstress_thrash_subtrees.yaml b/collections/multimds/tasks/fsstress_thrash_subtrees.yaml
deleted file mode 100644 (file)
index 4368e31..0000000
--- a/collections/multimds/tasks/fsstress_thrash_subtrees.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-tasks:
-- ceph:
-    conf:
-      mds:
-        mds thrash exports: 1
-        mds debug subtrees: 1
-        mds debug scatterstat: 1
-        mds verify scatter: 1
-- cfuse:
-- workunit:
-    client.0:
-      - suites/fsstress.sh
-

diff --git a/collections/multimon/clusters/21.yaml b/collections/multimon/clusters/21.yaml
deleted file mode 100644 (file)
index 2d13478..0000000
--- a/collections/multimon/clusters/21.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-roles:
-- [mon.a, mon.d, mon.g, mon.j, mon.m, mon.p, mon.s, osd.0]
-- [mon.b, mon.e, mon.h, mon.k, mon.n, mon.q, mon.t, mds.a]
-- [mon.c, mon.f, mon.i, mon.l, mon.o, mon.r, mon.u, osd.1]

diff --git a/collections/multimon/clusters/3.yaml b/collections/multimon/clusters/3.yaml
deleted file mode 100644 (file)
index 5646fab..0000000
--- a/collections/multimon/clusters/3.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-roles:
-- [mon.0, osd.0]
-- [mon.1, mds.a]
-- [mon.2, osd.1]

diff --git a/collections/multimon/clusters/6.yaml b/collections/multimon/clusters/6.yaml
deleted file mode 100644 (file)
index 662fc92..0000000
--- a/collections/multimon/clusters/6.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-roles:
-- [mon.a, mon.d, osd.0]
-- [mon.b, mon.e, mds.a]
-- [mon.c, mon.f, osd.1]

diff --git a/collections/multimon/clusters/9.yaml b/collections/multimon/clusters/9.yaml
deleted file mode 100644 (file)
index b87a158..0000000
--- a/collections/multimon/clusters/9.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-roles:
-- [mon.a, mon.d, mon.g, osd.0]
-- [mon.b, mon.e, mon.h, mds.a]
-- [mon.c, mon.f, mon.i, osd.1]

diff --git a/collections/multimon/tasks/mon_recovery.yaml b/collections/multimon/tasks/mon_recovery.yaml
deleted file mode 100644 (file)
index 6240d4c..0000000
--- a/collections/multimon/tasks/mon_recovery.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-tasks:
-- ceph:
-- mon_recovery:

diff --git a/collections/singleton/all/filestore-idempotent.yaml b/collections/singleton/all/filestore-idempotent.yaml
deleted file mode 100644 (file)
index fa24ce9..0000000
--- a/collections/singleton/all/filestore-idempotent.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-roles:
-- [mon.0, osd.0, osd.1, mds.0, client.0]
-tasks:
-- ceph:
-- filestore_idempotent:

diff --git a/collections/singleton/all/lost-unfound.yaml b/collections/singleton/all/lost-unfound.yaml
deleted file mode 100644 (file)
index 6707bdd..0000000
--- a/collections/singleton/all/lost-unfound.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-roles:
-- - mon.0
-  - mds.0
-  - osd.0
-- - mon.1
-  - osd.1
-- - mon.2
-  - osd.2
-tasks:
-- ceph:
-    log-whitelist:
-    - objects unfound and apparently lost
-- lost_unfound:

diff --git a/collections/thrash/btrfs/with-btrfs.yaml b/collections/thrash/btrfs/with-btrfs.yaml
deleted file mode 100644 (file)
index a16cc1b..0000000
--- a/collections/thrash/btrfs/with-btrfs.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-overrides:
-  ceph:
-    btrfs: 1

diff --git a/collections/thrash/btrfs/without-btrfs.yaml b/collections/thrash/btrfs/without-btrfs.yaml
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/collections/thrash/clusters/16-osd.yaml b/collections/thrash/clusters/16-osd.yaml
deleted file mode 100644 (file)
index 987df7e..0000000
--- a/collections/thrash/clusters/16-osd.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-roles:
-- [mon.0, mds.0, osd.0]
-- [mon.1, osd.1]
-- [mon.2, osd.2]
-- [osd.3]
-- [osd.4]
-- [osd.5]
-- [osd.6]
-- [osd.7]
-- [osd.8]
-- [osd.9]
-- [osd.10]
-- [osd.11]
-- [osd.12]
-- [osd.13]
-- [osd.14]
-- [osd.15]
-- [client.0]

diff --git a/collections/thrash/clusters/3-osd-1-machine.yaml b/collections/thrash/clusters/3-osd-1-machine.yaml
deleted file mode 100644 (file)
index dacc887..0000000
--- a/collections/thrash/clusters/3-osd-1-machine.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-roles:
-- [mon.0, mds.0, osd.0, osd.1, osd.2]
-- [mon.1, mon.2, client.0]

diff --git a/collections/thrash/clusters/8-osd.yaml b/collections/thrash/clusters/8-osd.yaml
deleted file mode 100644 (file)
index 6edc20b..0000000
--- a/collections/thrash/clusters/8-osd.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-roles:
-- [mon.0, mds.0, osd.0]
-- [mon.1, osd.1]
-- [mon.2, osd.2]
-- [osd.3]
-- [osd.4]
-- [osd.5]
-- [osd.6]
-- [osd.7]
-- [client.0]

diff --git a/collections/thrash/thrashers/default.yaml b/collections/thrash/thrashers/default.yaml
deleted file mode 100644 (file)
index 2004588..0000000
--- a/collections/thrash/thrashers/default.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- ceph:
-    log-whitelist:
-    - wrongly marked me down or wrong addr
-- thrashosds:

diff --git a/collections/thrash/thrashers/fast.yaml b/collections/thrash/thrashers/fast.yaml
deleted file mode 100644 (file)
index b0eec54..0000000
--- a/collections/thrash/thrashers/fast.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- ceph:
-    log-whitelist:
-    - wrongly marked me down or wrong addr
-- thrashosds:
-    op_delay: 1
-    chance_down: 10

diff --git a/collections/thrash/thrashers/more-down.yaml b/collections/thrash/thrashers/more-down.yaml
deleted file mode 100644 (file)
index 91de5de..0000000
--- a/collections/thrash/thrashers/more-down.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- ceph:
-    log-whitelist:
-    - wrongly marked me down or wrong addr
-- thrashosds:
-    chance_down: 50

diff --git a/collections/thrash/workloads/bonnie_cfuse.yaml b/collections/thrash/workloads/bonnie_cfuse.yaml
deleted file mode 100644 (file)
index 2175cb4..0000000
--- a/collections/thrash/workloads/bonnie_cfuse.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- cfuse:
-- workunit:
-    all:
-    - suites/bonnie.sh

diff --git a/collections/thrash/workloads/iozone_cfuse.yaml b/collections/thrash/workloads/iozone_cfuse.yaml
deleted file mode 100644 (file)
index 6d02328..0000000
--- a/collections/thrash/workloads/iozone_cfuse.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- cfuse:
-- workunit:
-    all:
-    - suites/iozone.sh

diff --git a/collections/thrash/workloads/radosbench.yaml b/collections/thrash/workloads/radosbench.yaml
deleted file mode 100644 (file)
index 3940870..0000000
--- a/collections/thrash/workloads/radosbench.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-tasks:
-- radosbench:
-    clients: [client.0]
-    time: 1800

diff --git a/collections/thrash/workloads/readwrite.yaml b/collections/thrash/workloads/readwrite.yaml
deleted file mode 100644 (file)
index a9f767b..0000000
--- a/collections/thrash/workloads/readwrite.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- testrados:
-    clients: [client.0]
-    ops: 4000
-    objects: 500

diff --git a/collections/thrash/workloads/snaps.yaml b/collections/thrash/workloads/snaps.yaml
deleted file mode 100644 (file)
index 6312591..0000000
--- a/collections/thrash/workloads/snaps.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- testrados:
-    snaps: True
-    clients: [client.0]
-    ops: 4000
-    objects: 500

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

diff --git a/suites/regression/basic/tasks/cfuse_dbench.yaml b/suites/regression/basic/tasks/cfuse_dbench.yaml
new file mode 100644 (file)
index 0000000..05cbf54
--- /dev/null
+++ b/suites/regression/basic/tasks/cfuse_dbench.yaml
@@ -0,0 +1,5 @@
+tasks:
+- ceph:
+- cfuse:
+- autotest:
+    all: [dbench]

diff --git a/suites/regression/basic/tasks/cfuse_workunit_kernel_untar_build.yaml b/suites/regression/basic/tasks/cfuse_workunit_kernel_untar_build.yaml
new file mode 100644 (file)
index 0000000..becbbfd
--- /dev/null
+++ b/suites/regression/basic/tasks/cfuse_workunit_kernel_untar_build.yaml
@@ -0,0 +1,6 @@
+tasks:
+- ceph:
+- cfuse:
+- workunit:
+    all:
+      - kernel_untar_build.sh

diff --git a/suites/regression/basic/tasks/cfuse_workunit_misc.yaml b/suites/regression/basic/tasks/cfuse_workunit_misc.yaml
new file mode 100644 (file)
index 0000000..7a08aab
--- /dev/null
+++ b/suites/regression/basic/tasks/cfuse_workunit_misc.yaml
@@ -0,0 +1,6 @@
+tasks:
+- ceph:
+- cfuse:
+- workunit:
+    all:
+      - misc

diff --git a/suites/regression/basic/tasks/cfuse_workunit_suites_blogbench.yaml b/suites/regression/basic/tasks/cfuse_workunit_suites_blogbench.yaml
new file mode 100644 (file)
index 0000000..03bb880
--- /dev/null
+++ b/suites/regression/basic/tasks/cfuse_workunit_suites_blogbench.yaml
@@ -0,0 +1,6 @@
+tasks:
+- ceph:
+- cfuse:
+- workunit:
+    all:
+      - suites/blogbench.sh

diff --git a/suites/regression/basic/tasks/cfuse_workunit_suites_dbench.yaml b/suites/regression/basic/tasks/cfuse_workunit_suites_dbench.yaml
new file mode 100644 (file)
index 0000000..cc3c65b
--- /dev/null
+++ b/suites/regression/basic/tasks/cfuse_workunit_suites_dbench.yaml
@@ -0,0 +1,6 @@
+tasks:
+- ceph:
+- cfuse:
+- workunit:
+    all:
+      - suites/dbench.sh

diff --git a/suites/regression/basic/tasks/cfuse_workunit_suites_ffsb.yaml b/suites/regression/basic/tasks/cfuse_workunit_suites_ffsb.yaml
new file mode 100644 (file)
index 0000000..966b329
--- /dev/null
+++ b/suites/regression/basic/tasks/cfuse_workunit_suites_ffsb.yaml
@@ -0,0 +1,6 @@
+tasks:
+- ceph:
+- cfuse:
+- workunit:
+    all:
+      - suites/ffsb.sh

diff --git a/suites/regression/basic/tasks/cfuse_workunit_suites_fsstress.yaml b/suites/regression/basic/tasks/cfuse_workunit_suites_fsstress.yaml
new file mode 100644 (file)
index 0000000..bb38946
--- /dev/null
+++ b/suites/regression/basic/tasks/cfuse_workunit_suites_fsstress.yaml
@@ -0,0 +1,6 @@
+tasks:
+- ceph:
+- cfuse:
+- workunit:
+    all:
+      - suites/fsstress.sh

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

diff --git a/suites/regression/basic/tasks/cfuse_workunit_suites_pjd.yaml b/suites/regression/basic/tasks/cfuse_workunit_suites_pjd.yaml
new file mode 100644 (file)
index 0000000..21ffd09
--- /dev/null
+++ b/suites/regression/basic/tasks/cfuse_workunit_suites_pjd.yaml
@@ -0,0 +1,6 @@
+tasks:
+- ceph:
+- cfuse:
+- workunit:
+    all:
+      - suites/pjd.sh

diff --git a/suites/regression/basic/tasks/cfuse_workunit_suites_tiobench.yaml b/suites/regression/basic/tasks/cfuse_workunit_suites_tiobench.yaml
new file mode 100644 (file)
index 0000000..326de71
--- /dev/null
+++ b/suites/regression/basic/tasks/cfuse_workunit_suites_tiobench.yaml
@@ -0,0 +1,6 @@
+tasks:
+- ceph:
+- cfuse:
+- workunit:
+    all:
+      - suites/tiobench.sh

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

diff --git a/suites/regression/basic/tasks/kclient_dbench.yaml b/suites/regression/basic/tasks/kclient_dbench.yaml
new file mode 100644 (file)
index 0000000..054dfcc
--- /dev/null
+++ b/suites/regression/basic/tasks/kclient_dbench.yaml
@@ -0,0 +1,5 @@
+tasks:
+- ceph:
+- kclient:
+- autotest:
+    all: [dbench]

diff --git a/suites/regression/basic/tasks/kclient_workunit_direct_io.yaml b/suites/regression/basic/tasks/kclient_workunit_direct_io.yaml
new file mode 100644 (file)
index 0000000..d66d2f2
--- /dev/null
+++ b/suites/regression/basic/tasks/kclient_workunit_direct_io.yaml
@@ -0,0 +1,7 @@
+tasks:
+- ceph:
+- kclient:
+- workunit:
+    all:
+      - direct_io
+

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

diff --git a/suites/regression/basic/tasks/kclient_workunit_kernel_untar_build.yaml b/suites/regression/basic/tasks/kclient_workunit_kernel_untar_build.yaml
new file mode 100644 (file)
index 0000000..63c0edd
--- /dev/null
+++ b/suites/regression/basic/tasks/kclient_workunit_kernel_untar_build.yaml
@@ -0,0 +1,6 @@
+tasks:
+- ceph:
+- kclient:
+- workunit:
+    all:
+      - kernel_untar_build.sh

diff --git a/suites/regression/basic/tasks/kclient_workunit_misc.yaml b/suites/regression/basic/tasks/kclient_workunit_misc.yaml
new file mode 100644 (file)
index 0000000..e3b08a5
--- /dev/null
+++ b/suites/regression/basic/tasks/kclient_workunit_misc.yaml
@@ -0,0 +1,6 @@
+tasks:
+- ceph:
+- kclient:
+- workunit:
+    all:
+      - misc

diff --git a/suites/regression/basic/tasks/kclient_workunit_suites_blogbench.yaml b/suites/regression/basic/tasks/kclient_workunit_suites_blogbench.yaml
new file mode 100644 (file)
index 0000000..4da1217
--- /dev/null
+++ b/suites/regression/basic/tasks/kclient_workunit_suites_blogbench.yaml
@@ -0,0 +1,6 @@
+tasks:
+- ceph:
+- kclient:
+- workunit:
+    all:
+      - suites/blogbench.sh

diff --git a/suites/regression/basic/tasks/kclient_workunit_suites_ffsb.yaml b/suites/regression/basic/tasks/kclient_workunit_suites_ffsb.yaml
new file mode 100644 (file)
index 0000000..2763738
--- /dev/null
+++ b/suites/regression/basic/tasks/kclient_workunit_suites_ffsb.yaml
@@ -0,0 +1,6 @@
+tasks:
+- ceph:
+- kclient:
+- workunit:
+    all:
+      - suites/ffsb.sh

diff --git a/suites/regression/basic/tasks/kclient_workunit_suites_fsstress.yaml b/suites/regression/basic/tasks/kclient_workunit_suites_fsstress.yaml
new file mode 100644 (file)
index 0000000..dbadd76
--- /dev/null
+++ b/suites/regression/basic/tasks/kclient_workunit_suites_fsstress.yaml
@@ -0,0 +1,6 @@
+tasks:
+- ceph:
+- kclient:
+- workunit:
+    all:
+      - suites/fsstress.sh

diff --git a/suites/regression/basic/tasks/kclient_workunit_suites_iozone.yaml b/suites/regression/basic/tasks/kclient_workunit_suites_iozone.yaml
new file mode 100644 (file)
index 0000000..5e3d985
--- /dev/null
+++ b/suites/regression/basic/tasks/kclient_workunit_suites_iozone.yaml
@@ -0,0 +1,6 @@
+tasks:
+- ceph:
+- kclient:
+- workunit:
+    all:
+      - suites/iozone.sh

diff --git a/suites/regression/basic/tasks/kclient_workunit_suites_pjd.yaml b/suites/regression/basic/tasks/kclient_workunit_suites_pjd.yaml
new file mode 100644 (file)
index 0000000..2f3e4a9
--- /dev/null
+++ b/suites/regression/basic/tasks/kclient_workunit_suites_pjd.yaml
@@ -0,0 +1,6 @@
+tasks:
+- ceph:
+- kclient:
+- workunit:
+    all:
+      - suites/pjd.sh

diff --git a/suites/regression/basic/tasks/kclient_workunit_suites_tiobench.yaml b/suites/regression/basic/tasks/kclient_workunit_suites_tiobench.yaml
new file mode 100644 (file)
index 0000000..acdb47a
--- /dev/null
+++ b/suites/regression/basic/tasks/kclient_workunit_suites_tiobench.yaml
@@ -0,0 +1,6 @@
+tasks:
+- ceph:
+- kclient:
+- workunit:
+    all:
+      - suites/tiobench.sh

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

diff --git a/suites/regression/basic/tasks/libcephfs_interface_tests.yaml b/suites/regression/basic/tasks/libcephfs_interface_tests.yaml
new file mode 100644 (file)
index 0000000..c2b19f1
--- /dev/null
+++ b/suites/regression/basic/tasks/libcephfs_interface_tests.yaml
@@ -0,0 +1,6 @@
+tasks:
+- ceph:
+- cfuse:
+- workunit:
+    client.0:
+      - libcephfs/test.sh

diff --git a/suites/regression/basic/tasks/rados_api_tests.yaml b/suites/regression/basic/tasks/rados_api_tests.yaml
new file mode 100644 (file)
index 0000000..2b3df4e
--- /dev/null
+++ b/suites/regression/basic/tasks/rados_api_tests.yaml
@@ -0,0 +1,6 @@
+tasks:
+- ceph:
+- cfuse:
+- workunit:
+    client.0:
+      - rados/test.sh

diff --git a/suites/regression/basic/tasks/rados_python.yaml b/suites/regression/basic/tasks/rados_python.yaml
new file mode 100644 (file)
index 0000000..bccc75a
--- /dev/null
+++ b/suites/regression/basic/tasks/rados_python.yaml
@@ -0,0 +1,6 @@
+tasks:
+- ceph:
+- cfuse:
+- workunit:
+    client.0:
+      - rados/test_python.sh

diff --git a/suites/regression/basic/tasks/rbd_api_tests.yaml b/suites/regression/basic/tasks/rbd_api_tests.yaml
new file mode 100644 (file)
index 0000000..6e4d422
--- /dev/null
+++ b/suites/regression/basic/tasks/rbd_api_tests.yaml
@@ -0,0 +1,6 @@
+tasks:
+- ceph:
+- cfuse:
+- workunit:
+    client.0:
+      - rbd/test_librbd.sh

diff --git a/suites/regression/basic/tasks/rbd_cli_copy.yaml b/suites/regression/basic/tasks/rbd_cli_copy.yaml
new file mode 100644 (file)
index 0000000..bc6d0e3
--- /dev/null
+++ b/suites/regression/basic/tasks/rbd_cli_copy.yaml
@@ -0,0 +1,6 @@
+tasks:
+- ceph:
+- cfuse:
+- workunit:
+    client.0:
+      - rbd/copy.sh

diff --git a/suites/regression/basic/tasks/rbd_cli_import_export.yaml b/suites/regression/basic/tasks/rbd_cli_import_export.yaml
new file mode 100644 (file)
index 0000000..8e031d1
--- /dev/null
+++ b/suites/regression/basic/tasks/rbd_cli_import_export.yaml
@@ -0,0 +1,6 @@
+tasks:
+- ceph:
+- cfuse:
+- workunit:
+    client.0:
+      - rbd/import_export.sh

diff --git a/suites/regression/basic/tasks/rbd_dbench.yaml b/suites/regression/basic/tasks/rbd_dbench.yaml
new file mode 100644 (file)
index 0000000..e98c20e
--- /dev/null
+++ b/suites/regression/basic/tasks/rbd_dbench.yaml
@@ -0,0 +1,6 @@
+tasks:
+- ceph:
+- rbd:
+    all:
+- autotest:
+    all: [dbench]

diff --git a/suites/regression/basic/tasks/rbd_python_api_tests.yaml b/suites/regression/basic/tasks/rbd_python_api_tests.yaml
new file mode 100644 (file)
index 0000000..110bd21
--- /dev/null
+++ b/suites/regression/basic/tasks/rbd_python_api_tests.yaml
@@ -0,0 +1,6 @@
+tasks:
+- ceph:
+- cfuse:
+- workunit:
+    client.0:
+      - rbd/test_librbd_python.sh

diff --git a/suites/regression/basic/tasks/rbd_workunit_kernel_untar_build.yaml b/suites/regression/basic/tasks/rbd_workunit_kernel_untar_build.yaml
new file mode 100644 (file)
index 0000000..7dae1e7
--- /dev/null
+++ b/suites/regression/basic/tasks/rbd_workunit_kernel_untar_build.yaml
@@ -0,0 +1,7 @@
+tasks:
+- ceph:
+- rbd:
+    all:
+- workunit:
+    all:
+      - kernel_untar_build.sh

diff --git a/suites/regression/basic/tasks/rbd_workunit_suites_ffsb.yaml b/suites/regression/basic/tasks/rbd_workunit_suites_ffsb.yaml
new file mode 100644 (file)
index 0000000..9a276ae
--- /dev/null
+++ b/suites/regression/basic/tasks/rbd_workunit_suites_ffsb.yaml
@@ -0,0 +1,8 @@
+tasks:
+- ceph:
+- rbd:
+    all:
+      image_size: 20480
+- workunit:
+    all:
+      - suites/ffsb.sh

diff --git a/suites/regression/basic/tasks/rbd_workunit_suites_fsstress.yaml b/suites/regression/basic/tasks/rbd_workunit_suites_fsstress.yaml
new file mode 100644 (file)
index 0000000..062b07c
--- /dev/null
+++ b/suites/regression/basic/tasks/rbd_workunit_suites_fsstress.yaml
@@ -0,0 +1,7 @@
+tasks:
+- ceph:
+- rbd:
+    all:
+- workunit:
+    all:
+      - suites/fsstress.sh

diff --git a/suites/regression/basic/tasks/rbd_workunit_suites_fsx.yaml b/suites/regression/basic/tasks/rbd_workunit_suites_fsx.yaml
new file mode 100644 (file)
index 0000000..9269f43
--- /dev/null
+++ b/suites/regression/basic/tasks/rbd_workunit_suites_fsx.yaml
@@ -0,0 +1,7 @@
+tasks:
+- ceph:
+- rbd:
+    all:
+- workunit:
+    all:
+      - suites/fsx.sh

diff --git a/suites/regression/basic/tasks/rbd_workunit_suites_iozone.yaml b/suites/regression/basic/tasks/rbd_workunit_suites_iozone.yaml
new file mode 100644 (file)
index 0000000..4578ac5
--- /dev/null
+++ b/suites/regression/basic/tasks/rbd_workunit_suites_iozone.yaml
@@ -0,0 +1,8 @@
+tasks:
+- ceph:
+- rbd:
+    all:
+      image_size: 20480
+- workunit:
+    all:
+      - suites/iozone.sh

diff --git a/suites/regression/basic/tasks/rbd_workunit_suites_tiobench.yaml b/suites/regression/basic/tasks/rbd_workunit_suites_tiobench.yaml
new file mode 100644 (file)
index 0000000..3940102
--- /dev/null
+++ b/suites/regression/basic/tasks/rbd_workunit_suites_tiobench.yaml
@@ -0,0 +1,7 @@
+tasks:
+- ceph:
+- rbd:
+    all:
+- workunit:
+    all:
+      - suites/tiobench.sh

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

diff --git a/suites/regression/basic/tasks/rgw_s3tests.yaml b/suites/regression/basic/tasks/rgw_s3tests.yaml
new file mode 100644 (file)
index 0000000..13d265d
--- /dev/null
+++ b/suites/regression/basic/tasks/rgw_s3tests.yaml
@@ -0,0 +1,6 @@
+tasks:
+- ceph:
+- rgw: [client.0]
+- s3tests:
+    client.0:
+      rgw_server: client.0

diff --git a/suites/regression/multiclient/clusters/two_clients.yaml b/suites/regression/multiclient/clusters/two_clients.yaml
new file mode 100644 (file)
index 0000000..5c9f166
--- /dev/null
+++ b/suites/regression/multiclient/clusters/two_clients.yaml
@@ -0,0 +1,4 @@
+roles:
+- [mon.0, mds.0, osd.0, osd.1]
+- [mon.1, client.1]
+- [mon.2, client.0]

diff --git a/suites/regression/multiclient/tasks/locktest.yaml b/suites/regression/multiclient/tasks/locktest.yaml
new file mode 100644 (file)
index 0000000..255bbaf
--- /dev/null
+++ b/suites/regression/multiclient/tasks/locktest.yaml
@@ -0,0 +1,4 @@
+tasks:
+- ceph:
+- kclient:
+- locktest: [client.0, client.1]

diff --git a/suites/regression/singleton/all/filestore-idempotent.yaml b/suites/regression/singleton/all/filestore-idempotent.yaml
new file mode 100644 (file)
index 0000000..fa24ce9
--- /dev/null
+++ b/suites/regression/singleton/all/filestore-idempotent.yaml
@@ -0,0 +1,5 @@
+roles:
+- [mon.0, osd.0, osd.1, mds.0, client.0]
+tasks:
+- ceph:
+- filestore_idempotent:

diff --git a/suites/regression/singleton/all/lost-unfound.yaml b/suites/regression/singleton/all/lost-unfound.yaml
new file mode 100644 (file)
index 0000000..6707bdd
--- /dev/null
+++ b/suites/regression/singleton/all/lost-unfound.yaml
@@ -0,0 +1,13 @@
+roles:
+- - mon.0
+  - mds.0
+  - osd.0
+- - mon.1
+  - osd.1
+- - mon.2
+  - osd.2
+tasks:
+- ceph:
+    log-whitelist:
+    - objects unfound and apparently lost
+- lost_unfound:

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

diff --git a/suites/stress/bench/tasks/cfuse_workunit_snaps.yaml b/suites/stress/bench/tasks/cfuse_workunit_snaps.yaml
new file mode 100644 (file)
index 0000000..ec7ef0a
--- /dev/null
+++ b/suites/stress/bench/tasks/cfuse_workunit_snaps.yaml
@@ -0,0 +1,6 @@
+tasks:
+- ceph:
+- cfuse:
+- workunit:
+    all:
+      - snaps

diff --git a/suites/stress/bench/tasks/cfuse_workunit_suites_fsx.yaml b/suites/stress/bench/tasks/cfuse_workunit_suites_fsx.yaml
new file mode 100644 (file)
index 0000000..08bd680
--- /dev/null
+++ b/suites/stress/bench/tasks/cfuse_workunit_suites_fsx.yaml
@@ -0,0 +1,6 @@
+tasks:
+- ceph:
+- cfuse:
+- workunit:
+    all:
+      - suites/fsx.sh

diff --git a/suites/stress/bench/tasks/kclient_workunit_suites_fsx.yaml b/suites/stress/bench/tasks/kclient_workunit_suites_fsx.yaml
new file mode 100644 (file)
index 0000000..98862e1
--- /dev/null
+++ b/suites/stress/bench/tasks/kclient_workunit_suites_fsx.yaml
@@ -0,0 +1,6 @@
+tasks:
+- ceph:
+- kclient:
+- workunit:
+    all:
+      - suites/fsx.sh

diff --git a/suites/stress/multimds/clusters/7-multimds.yaml b/suites/stress/multimds/clusters/7-multimds.yaml
new file mode 100644 (file)
index 0000000..17cfd7b
--- /dev/null
+++ b/suites/stress/multimds/clusters/7-multimds.yaml
@@ -0,0 +1,8 @@
+roles:
+- [mon.a, mds.a, mds.a-s]
+- [mon.b, mds.b, mds.b-s]
+- [mon.c, mds.c, mds.c-s]
+- [osd.0]
+- [osd.1]
+- [osd.2]
+- [client.0]

diff --git a/suites/stress/multimds/tasks/fsstress_thrash_subtrees.yaml b/suites/stress/multimds/tasks/fsstress_thrash_subtrees.yaml
new file mode 100644 (file)
index 0000000..4368e31
--- /dev/null
+++ b/suites/stress/multimds/tasks/fsstress_thrash_subtrees.yaml
@@ -0,0 +1,13 @@
+tasks:
+- ceph:
+    conf:
+      mds:
+        mds thrash exports: 1
+        mds debug subtrees: 1
+        mds debug scatterstat: 1
+        mds verify scatter: 1
+- cfuse:
+- workunit:
+    client.0:
+      - suites/fsstress.sh
+

diff --git a/suites/stress/multimon/clusters/21.yaml b/suites/stress/multimon/clusters/21.yaml
new file mode 100644 (file)
index 0000000..2d13478
--- /dev/null
+++ b/suites/stress/multimon/clusters/21.yaml
@@ -0,0 +1,4 @@
+roles:
+- [mon.a, mon.d, mon.g, mon.j, mon.m, mon.p, mon.s, osd.0]
+- [mon.b, mon.e, mon.h, mon.k, mon.n, mon.q, mon.t, mds.a]
+- [mon.c, mon.f, mon.i, mon.l, mon.o, mon.r, mon.u, osd.1]

diff --git a/suites/stress/multimon/clusters/3.yaml b/suites/stress/multimon/clusters/3.yaml
new file mode 100644 (file)
index 0000000..5646fab
--- /dev/null
+++ b/suites/stress/multimon/clusters/3.yaml
@@ -0,0 +1,4 @@
+roles:
+- [mon.0, osd.0]
+- [mon.1, mds.a]
+- [mon.2, osd.1]

diff --git a/suites/stress/multimon/clusters/6.yaml b/suites/stress/multimon/clusters/6.yaml
new file mode 100644 (file)
index 0000000..662fc92
--- /dev/null
+++ b/suites/stress/multimon/clusters/6.yaml
@@ -0,0 +1,4 @@
+roles:
+- [mon.a, mon.d, osd.0]
+- [mon.b, mon.e, mds.a]
+- [mon.c, mon.f, osd.1]

diff --git a/suites/stress/multimon/clusters/9.yaml b/suites/stress/multimon/clusters/9.yaml
new file mode 100644 (file)
index 0000000..b87a158
--- /dev/null
+++ b/suites/stress/multimon/clusters/9.yaml
@@ -0,0 +1,4 @@
+roles:
+- [mon.a, mon.d, mon.g, osd.0]
+- [mon.b, mon.e, mon.h, mds.a]
+- [mon.c, mon.f, mon.i, osd.1]

diff --git a/suites/stress/multimon/tasks/mon_recovery.yaml b/suites/stress/multimon/tasks/mon_recovery.yaml
new file mode 100644 (file)
index 0000000..6240d4c
--- /dev/null
+++ b/suites/stress/multimon/tasks/mon_recovery.yaml
@@ -0,0 +1,3 @@
+tasks:
+- ceph:
+- mon_recovery:

diff --git a/suites/stress/thrash/btrfs/with-btrfs.yaml b/suites/stress/thrash/btrfs/with-btrfs.yaml
new file mode 100644 (file)
index 0000000..a16cc1b
--- /dev/null
+++ b/suites/stress/thrash/btrfs/with-btrfs.yaml
@@ -0,0 +1,3 @@
+overrides:
+  ceph:
+    btrfs: 1

diff --git a/suites/stress/thrash/btrfs/without-btrfs.yaml b/suites/stress/thrash/btrfs/without-btrfs.yaml
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/suites/stress/thrash/clusters/16-osd.yaml b/suites/stress/thrash/clusters/16-osd.yaml
new file mode 100644 (file)
index 0000000..987df7e
--- /dev/null
+++ b/suites/stress/thrash/clusters/16-osd.yaml
@@ -0,0 +1,18 @@
+roles:
+- [mon.0, mds.0, osd.0]
+- [mon.1, osd.1]
+- [mon.2, osd.2]
+- [osd.3]
+- [osd.4]
+- [osd.5]
+- [osd.6]
+- [osd.7]
+- [osd.8]
+- [osd.9]
+- [osd.10]
+- [osd.11]
+- [osd.12]
+- [osd.13]
+- [osd.14]
+- [osd.15]
+- [client.0]

diff --git a/suites/stress/thrash/clusters/3-osd-1-machine.yaml b/suites/stress/thrash/clusters/3-osd-1-machine.yaml
new file mode 100644 (file)
index 0000000..dacc887
--- /dev/null
+++ b/suites/stress/thrash/clusters/3-osd-1-machine.yaml
@@ -0,0 +1,3 @@
+roles:
+- [mon.0, mds.0, osd.0, osd.1, osd.2]
+- [mon.1, mon.2, client.0]

diff --git a/suites/stress/thrash/clusters/8-osd.yaml b/suites/stress/thrash/clusters/8-osd.yaml
new file mode 100644 (file)
index 0000000..6edc20b
--- /dev/null
+++ b/suites/stress/thrash/clusters/8-osd.yaml
@@ -0,0 +1,10 @@
+roles:
+- [mon.0, mds.0, osd.0]
+- [mon.1, osd.1]
+- [mon.2, osd.2]
+- [osd.3]
+- [osd.4]
+- [osd.5]
+- [osd.6]
+- [osd.7]
+- [client.0]

diff --git a/suites/stress/thrash/thrashers/default.yaml b/suites/stress/thrash/thrashers/default.yaml
new file mode 100644 (file)
index 0000000..2004588
--- /dev/null
+++ b/suites/stress/thrash/thrashers/default.yaml
@@ -0,0 +1,5 @@
+tasks:
+- ceph:
+    log-whitelist:
+    - wrongly marked me down or wrong addr
+- thrashosds:

diff --git a/suites/stress/thrash/thrashers/fast.yaml b/suites/stress/thrash/thrashers/fast.yaml
new file mode 100644 (file)
index 0000000..b0eec54
--- /dev/null
+++ b/suites/stress/thrash/thrashers/fast.yaml
@@ -0,0 +1,7 @@
+tasks:
+- ceph:
+    log-whitelist:
+    - wrongly marked me down or wrong addr
+- thrashosds:
+    op_delay: 1
+    chance_down: 10

diff --git a/suites/stress/thrash/thrashers/more-down.yaml b/suites/stress/thrash/thrashers/more-down.yaml
new file mode 100644 (file)
index 0000000..91de5de
--- /dev/null
+++ b/suites/stress/thrash/thrashers/more-down.yaml
@@ -0,0 +1,6 @@
+tasks:
+- ceph:
+    log-whitelist:
+    - wrongly marked me down or wrong addr
+- thrashosds:
+    chance_down: 50

diff --git a/suites/stress/thrash/workloads/bonnie_cfuse.yaml b/suites/stress/thrash/workloads/bonnie_cfuse.yaml
new file mode 100644 (file)
index 0000000..2175cb4
--- /dev/null
+++ b/suites/stress/thrash/workloads/bonnie_cfuse.yaml
@@ -0,0 +1,5 @@
+tasks:
+- cfuse:
+- workunit:
+    all:
+    - suites/bonnie.sh

diff --git a/suites/stress/thrash/workloads/iozone_cfuse.yaml b/suites/stress/thrash/workloads/iozone_cfuse.yaml
new file mode 100644 (file)
index 0000000..6d02328
--- /dev/null
+++ b/suites/stress/thrash/workloads/iozone_cfuse.yaml
@@ -0,0 +1,5 @@
+tasks:
+- cfuse:
+- workunit:
+    all:
+    - suites/iozone.sh

diff --git a/suites/stress/thrash/workloads/radosbench.yaml b/suites/stress/thrash/workloads/radosbench.yaml
new file mode 100644 (file)
index 0000000..3940870
--- /dev/null
+++ b/suites/stress/thrash/workloads/radosbench.yaml
@@ -0,0 +1,4 @@
+tasks:
+- radosbench:
+    clients: [client.0]
+    time: 1800

diff --git a/suites/stress/thrash/workloads/readwrite.yaml b/suites/stress/thrash/workloads/readwrite.yaml
new file mode 100644 (file)
index 0000000..a9f767b
--- /dev/null
+++ b/suites/stress/thrash/workloads/readwrite.yaml
@@ -0,0 +1,5 @@
+tasks:
+- testrados:
+    clients: [client.0]
+    ops: 4000
+    objects: 500

diff --git a/suites/stress/thrash/workloads/snaps.yaml b/suites/stress/thrash/workloads/snaps.yaml
new file mode 100644 (file)
index 0000000..6312591
--- /dev/null
+++ b/suites/stress/thrash/workloads/snaps.yaml
@@ -0,0 +1,6 @@
+tasks:
+- testrados:
+    snaps: True
+    clients: [client.0]
+    ops: 4000
+    objects: 500