separate regression suite into topical categories rados, rbd, fs

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

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

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

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

diff --git a/suites/fs/basic/tasks/cfuse_workunit_suites_blogbench.yaml b/suites/fs/basic/tasks/cfuse_workunit_suites_blogbench.yaml
new file mode 100644 (file)
index 0000000..4c9ff41
--- /dev/null
+++ b/suites/fs/basic/tasks/cfuse_workunit_suites_blogbench.yaml
@@ -0,0 +1,7 @@
+tasks:
+- ceph:
+- ceph-fuse:
+- workunit:
+    clients:
+      all:
+        - suites/blogbench.sh

diff --git a/suites/fs/basic/tasks/cfuse_workunit_suites_dbench.yaml b/suites/fs/basic/tasks/cfuse_workunit_suites_dbench.yaml
new file mode 100644 (file)
index 0000000..2d64f63
--- /dev/null
+++ b/suites/fs/basic/tasks/cfuse_workunit_suites_dbench.yaml
@@ -0,0 +1,7 @@
+tasks:
+- ceph:
+- ceph-fuse:
+- workunit:
+    clients:
+      all:
+        - suites/dbench.sh

diff --git a/suites/fs/basic/tasks/cfuse_workunit_suites_ffsb.yaml b/suites/fs/basic/tasks/cfuse_workunit_suites_ffsb.yaml
new file mode 100644 (file)
index 0000000..22cf239
--- /dev/null
+++ b/suites/fs/basic/tasks/cfuse_workunit_suites_ffsb.yaml
@@ -0,0 +1,7 @@
+tasks:
+- ceph:
+- ceph-fuse:
+- workunit:
+    clients:
+      all:
+        - suites/ffsb.sh

diff --git a/suites/fs/basic/tasks/cfuse_workunit_suites_fsstress.yaml b/suites/fs/basic/tasks/cfuse_workunit_suites_fsstress.yaml
new file mode 100644 (file)
index 0000000..8f0bc59
--- /dev/null
+++ b/suites/fs/basic/tasks/cfuse_workunit_suites_fsstress.yaml
@@ -0,0 +1,7 @@
+tasks:
+- ceph:
+- ceph-fuse:
+- workunit:
+    clients:
+      all:
+        - suites/fsstress.sh

diff --git a/suites/fs/basic/tasks/cfuse_workunit_suites_fsx.yaml b/suites/fs/basic/tasks/cfuse_workunit_suites_fsx.yaml
new file mode 100644 (file)
index 0000000..9b59a22
--- /dev/null
+++ b/suites/fs/basic/tasks/cfuse_workunit_suites_fsx.yaml
@@ -0,0 +1,7 @@
+tasks:
+- ceph:
+- ceph-fuse:
+- workunit:
+    clients:
+      all:
+        - suites/fsx.sh

diff --git a/suites/fs/basic/tasks/cfuse_workunit_suites_iozone.yaml b/suites/fs/basic/tasks/cfuse_workunit_suites_iozone.yaml
new file mode 100644 (file)
index 0000000..fedc230
--- /dev/null
+++ b/suites/fs/basic/tasks/cfuse_workunit_suites_iozone.yaml
@@ -0,0 +1,7 @@
+tasks:
+- ceph:
+- ceph-fuse: [client.0]
+- workunit:
+    clients:
+      all:
+        - suites/iozone.sh

diff --git a/suites/fs/basic/tasks/cfuse_workunit_suites_pjd.yaml b/suites/fs/basic/tasks/cfuse_workunit_suites_pjd.yaml
new file mode 100644 (file)
index 0000000..d7f729e
--- /dev/null
+++ b/suites/fs/basic/tasks/cfuse_workunit_suites_pjd.yaml
@@ -0,0 +1,7 @@
+tasks:
+- ceph:
+- ceph-fuse:
+- workunit:
+    clients:
+      all:
+        - suites/pjd.sh

diff --git a/suites/fs/basic/tasks/cfuse_workunit_suites_tiobench.yaml b/suites/fs/basic/tasks/cfuse_workunit_suites_tiobench.yaml
new file mode 100644 (file)
index 0000000..73fc216
--- /dev/null
+++ b/suites/fs/basic/tasks/cfuse_workunit_suites_tiobench.yaml
@@ -0,0 +1,7 @@
+tasks:
+- ceph:
+- ceph-fuse:
+- workunit:
+    clients:
+      all:
+        - suites/tiobench.sh

diff --git a/suites/fs/basic/tasks/cfuse_workunit_trivial_sync.yaml b/suites/fs/basic/tasks/cfuse_workunit_trivial_sync.yaml
new file mode 100644 (file)
index 0000000..85c9fd1
--- /dev/null
+++ b/suites/fs/basic/tasks/cfuse_workunit_trivial_sync.yaml
@@ -0,0 +1,6 @@
+tasks:
+- ceph:
+- ceph-fuse:
+- workunit:
+    clients:
+      all: [misc/trivial_sync.sh]

diff --git a/suites/fs/basic/tasks/libcephfs_interface_tests.yaml b/suites/fs/basic/tasks/libcephfs_interface_tests.yaml
new file mode 100644 (file)
index 0000000..70e9427
--- /dev/null
+++ b/suites/fs/basic/tasks/libcephfs_interface_tests.yaml
@@ -0,0 +1,7 @@
+tasks:
+- ceph:
+- ceph-fuse:
+- workunit:
+    clients:
+      client.0:
+        - libcephfs/test.sh

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

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

diff --git a/suites/fs/verify/tasks/cfuse_workunit_suites_dbench.yaml b/suites/fs/verify/tasks/cfuse_workunit_suites_dbench.yaml
new file mode 100644 (file)
index 0000000..e96ba01
--- /dev/null
+++ b/suites/fs/verify/tasks/cfuse_workunit_suites_dbench.yaml
@@ -0,0 +1,11 @@
+tasks:
+- ceph:
+    conf:
+      client:
+        debug client: 1/20
+        debug ms: 0/10
+- ceph-fuse:
+- workunit:
+    clients:
+      all:
+        - suites/dbench.sh

diff --git a/suites/fs/verify/tasks/cfuse_workunit_suites_fsstress.yaml b/suites/fs/verify/tasks/cfuse_workunit_suites_fsstress.yaml
new file mode 100644 (file)
index 0000000..8f0bc59
--- /dev/null
+++ b/suites/fs/verify/tasks/cfuse_workunit_suites_fsstress.yaml
@@ -0,0 +1,7 @@
+tasks:
+- ceph:
+- ceph-fuse:
+- workunit:
+    clients:
+      all:
+        - suites/fsstress.sh

diff --git a/suites/fs/verify/tasks/libcephfs_interface_tests.yaml b/suites/fs/verify/tasks/libcephfs_interface_tests.yaml
new file mode 100644 (file)
index 0000000..70e9427
--- /dev/null
+++ b/suites/fs/verify/tasks/libcephfs_interface_tests.yaml
@@ -0,0 +1,7 @@
+tasks:
+- ceph:
+- ceph-fuse:
+- workunit:
+    clients:
+      client.0:
+        - libcephfs/test.sh

diff --git a/suites/fs/verify/validater/lockdep.yaml b/suites/fs/verify/validater/lockdep.yaml
new file mode 100644 (file)
index 0000000..25f8435
--- /dev/null
+++ b/suites/fs/verify/validater/lockdep.yaml
@@ -0,0 +1,5 @@
+overrides:
+  ceph:
+    conf:
+      global:
+        lockdep: true

diff --git a/suites/fs/verify/validater/valgrind.yaml b/suites/fs/verify/validater/valgrind.yaml
new file mode 100644 (file)
index 0000000..2cbef8a
--- /dev/null
+++ b/suites/fs/verify/validater/valgrind.yaml
@@ -0,0 +1,6 @@
+overrides:
+  ceph:
+    valgrind:
+      mon: [--tool=memcheck]
+      osd: [--tool=memcheck]
+      mds: [--tool=memcheck]

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

diff --git a/suites/rados/basic/fs/btrfs.yaml b/suites/rados/basic/fs/btrfs.yaml
new file mode 100644 (file)
index 0000000..0e9746f
--- /dev/null
+++ b/suites/rados/basic/fs/btrfs.yaml
@@ -0,0 +1,3 @@
+overrides:
+  ceph:
+    fs: btrfs

diff --git a/suites/rados/basic/tasks/rados_api_tests.yaml b/suites/rados/basic/tasks/rados_api_tests.yaml
new file mode 100644 (file)
index 0000000..32ac50a
--- /dev/null
+++ b/suites/rados/basic/tasks/rados_api_tests.yaml
@@ -0,0 +1,7 @@
+tasks:
+- ceph:
+- ceph-fuse:
+- workunit:
+    clients:
+      client.0:
+        - rados/test.sh

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

diff --git a/suites/rados/basic/tasks/rados_stress_watch.yaml b/suites/rados/basic/tasks/rados_stress_watch.yaml
new file mode 100644 (file)
index 0000000..788f989
--- /dev/null
+++ b/suites/rados/basic/tasks/rados_stress_watch.yaml
@@ -0,0 +1,7 @@
+tasks:
+- ceph:
+- ceph-fuse:
+- workunit:
+    clients:
+      client.0:
+        - rados/stress_watch.sh

diff --git a/suites/rados/basic/tasks/rados_workunit_loadgen_big.yaml b/suites/rados/basic/tasks/rados_workunit_loadgen_big.yaml
new file mode 100644 (file)
index 0000000..7ecc6ed
--- /dev/null
+++ b/suites/rados/basic/tasks/rados_workunit_loadgen_big.yaml
@@ -0,0 +1,7 @@
+tasks:
+- ceph:
+- ceph-fuse:
+- workunit:
+    clients:
+      all:
+        - rados/load-gen-big.sh

diff --git a/suites/rados/basic/tasks/rados_workunit_loadgen_mix.yaml b/suites/rados/basic/tasks/rados_workunit_loadgen_mix.yaml
new file mode 100644 (file)
index 0000000..b3c02f0
--- /dev/null
+++ b/suites/rados/basic/tasks/rados_workunit_loadgen_mix.yaml
@@ -0,0 +1,7 @@
+tasks:
+- ceph:
+- ceph-fuse:
+- workunit:
+    clients:
+      all:
+        - rados/load-gen-mix.sh

diff --git a/suites/rados/basic/tasks/rados_workunit_loadgen_mostlyread.yaml b/suites/rados/basic/tasks/rados_workunit_loadgen_mostlyread.yaml
new file mode 100644 (file)
index 0000000..8ed27eb
--- /dev/null
+++ b/suites/rados/basic/tasks/rados_workunit_loadgen_mostlyread.yaml
@@ -0,0 +1,7 @@
+tasks:
+- ceph:
+- ceph-fuse:
+- workunit:
+    clients:
+      all:
+        - rados/load-gen-mostlyread.sh

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

diff --git a/suites/rados/multifs/fs/btrfs.yaml b/suites/rados/multifs/fs/btrfs.yaml
new file mode 100644 (file)
index 0000000..0e9746f
--- /dev/null
+++ b/suites/rados/multifs/fs/btrfs.yaml
@@ -0,0 +1,3 @@
+overrides:
+  ceph:
+    fs: btrfs

diff --git a/suites/rados/multifs/fs/ext4.yaml b/suites/rados/multifs/fs/ext4.yaml
new file mode 100644 (file)
index 0000000..fde6751
--- /dev/null
+++ b/suites/rados/multifs/fs/ext4.yaml
@@ -0,0 +1,3 @@
+overrides:
+  ceph:
+    fs: ext4

diff --git a/suites/rados/multifs/fs/xfs.yaml b/suites/rados/multifs/fs/xfs.yaml
new file mode 100644 (file)
index 0000000..bfc3d61
--- /dev/null
+++ b/suites/rados/multifs/fs/xfs.yaml
@@ -0,0 +1,3 @@
+overrides:
+  ceph:
+    fs: xfs

diff --git a/suites/rados/multifs/tasks/rgw_readwrite.yaml b/suites/rados/multifs/tasks/rgw_readwrite.yaml
new file mode 100644 (file)
index 0000000..3e59fc2
--- /dev/null
+++ b/suites/rados/multifs/tasks/rgw_readwrite.yaml
@@ -0,0 +1,15 @@
+tasks:
+- ceph:
+- rgw: [client.0]
+- s3readwrite:
+    client.0:
+      rgw_server: client.0
+      readwrite:
+        bucket: rwtest
+        readers: 10
+        writers: 3
+        duration: 300
+        files:
+          num: 10
+          size: 2000
+          stddev: 500 

diff --git a/suites/rados/multifs/tasks/rgw_roundtrip.yaml b/suites/rados/multifs/tasks/rgw_roundtrip.yaml
new file mode 100644 (file)
index 0000000..348919b
--- /dev/null
+++ b/suites/rados/multifs/tasks/rgw_roundtrip.yaml
@@ -0,0 +1,15 @@
+tasks:
+- ceph:
+- rgw: [client.0]
+- s3roundtrip:
+    client.0:
+      rgw_server: client.0
+      roundtrip:
+        bucket: rttest
+        readers: 10
+        writers: 3
+        duration: 300
+        files:
+          num: 10
+          size: 2000
+          stddev: 500 

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

diff --git a/suites/rados/multimon/clusters/21.yaml b/suites/rados/multimon/clusters/21.yaml
new file mode 100644 (file)
index 0000000..2d13478
--- /dev/null
+++ b/suites/rados/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/rados/multimon/clusters/3.yaml b/suites/rados/multimon/clusters/3.yaml
new file mode 100644 (file)
index 0000000..703cc66
--- /dev/null
+++ b/suites/rados/multimon/clusters/3.yaml
@@ -0,0 +1,2 @@
+roles:
+- [mon.a, mon.b, mon.c, osd.0, osd.1, mds.a]

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

diff --git a/suites/rados/multimon/clusters/9.yaml b/suites/rados/multimon/clusters/9.yaml
new file mode 100644 (file)
index 0000000..b87a158
--- /dev/null
+++ b/suites/rados/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/rados/multimon/tasks/mon_recovery.yaml b/suites/rados/multimon/tasks/mon_recovery.yaml
new file mode 100644 (file)
index 0000000..6240d4c
--- /dev/null
+++ b/suites/rados/multimon/tasks/mon_recovery.yaml
@@ -0,0 +1,3 @@
+tasks:
+- ceph:
+- mon_recovery:

diff --git a/suites/rados/singleton/all/admin-socket.yaml b/suites/rados/singleton/all/admin-socket.yaml
new file mode 100644 (file)
index 0000000..24da643
--- /dev/null
+++ b/suites/rados/singleton/all/admin-socket.yaml
@@ -0,0 +1,17 @@
+roles:
+- - mon.a
+  - osd.0
+  - mds.a
+  - osd.1
+  - client.a
+tasks:
+- ceph: null
+- admin_socket:
+    osd.0:
+      version:
+      git_version:
+      help:
+      config show:
+      config set filestore_dump_file /tmp/foo:
+      perf dump:
+      perf schema:

diff --git a/suites/rados/singleton/all/dump-stuck.yaml b/suites/rados/singleton/all/dump-stuck.yaml
new file mode 100644 (file)
index 0000000..380cded
--- /dev/null
+++ b/suites/rados/singleton/all/dump-stuck.yaml
@@ -0,0 +1,14 @@
+roles:
+- - mon.a
+  - mds.0
+  - osd.0
+  - osd.1
+tasks:
+- ceph:
+    log-whitelist:
+    - wrongly marked me down
+    conf:
+      mon:
+        mon_osd_report_timeout: 90
+        mon_pg_stuck_threshold: 10
+- dump_stuck:

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

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

diff --git a/suites/rados/singleton/all/osd-backfill.yaml b/suites/rados/singleton/all/osd-backfill.yaml
new file mode 100644 (file)
index 0000000..a8161e9
--- /dev/null
+++ b/suites/rados/singleton/all/osd-backfill.yaml
@@ -0,0 +1,16 @@
+roles:
+- - mon.a
+  - mon.b
+  - mon.c
+  - mds.a
+  - osd.0
+  - osd.1
+  - osd.2
+tasks:
+- ceph:
+    log-whitelist:
+    - wrongly marked me down
+    conf:
+      osd:
+        osd min pg log entries: 5
+- osd_backfill:

diff --git a/suites/rados/singleton/all/osd-recovery-incomplete.yaml b/suites/rados/singleton/all/osd-recovery-incomplete.yaml
new file mode 100644 (file)
index 0000000..6e4a4d7
--- /dev/null
+++ b/suites/rados/singleton/all/osd-recovery-incomplete.yaml
@@ -0,0 +1,17 @@
+roles:
+- - mon.a
+  - mon.b
+  - mon.c
+  - mds.a
+  - osd.0
+  - osd.1
+  - osd.2
+  - osd.3
+tasks:
+- ceph:
+    log-whitelist:
+    - wrongly marked me down
+    conf:
+      osd:
+        osd min pg log entries: 5
+- osd_recovery.test_incomplete_pgs:

diff --git a/suites/rados/singleton/all/osd-recovery.yaml b/suites/rados/singleton/all/osd-recovery.yaml
new file mode 100644 (file)
index 0000000..65c0f6b
--- /dev/null
+++ b/suites/rados/singleton/all/osd-recovery.yaml
@@ -0,0 +1,16 @@
+roles:
+- - mon.a
+  - mon.b
+  - mon.c
+  - mds.a
+  - osd.0
+  - osd.1
+  - osd.2
+tasks:
+- ceph:
+    log-whitelist:
+    - wrongly marked me down
+    conf:
+      osd:
+        osd min pg log entries: 5
+- osd_recovery:

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

diff --git a/suites/rados/singleton/all/radosgw-admin.yaml b/suites/rados/singleton/all/radosgw-admin.yaml
new file mode 100644 (file)
index 0000000..231bc4b
--- /dev/null
+++ b/suites/rados/singleton/all/radosgw-admin.yaml
@@ -0,0 +1,7 @@
+roles:
+- [mon.a, mds.a, osd.0, client.0, osd.1]
+tasks:
+- ceph:
+- rgw:
+    client.0:
+- radosgw-admin:

diff --git a/suites/rados/singleton/all/thrash-rados.yaml b/suites/rados/singleton/all/thrash-rados.yaml
new file mode 100644 (file)
index 0000000..a4b14d6
--- /dev/null
+++ b/suites/rados/singleton/all/thrash-rados.yaml
@@ -0,0 +1,23 @@
+roles:
+- - mon.a
+  - mds.0
+  - osd.0
+  - osd.1
+  - osd.2
+- - osd.3
+  - osd.4
+  - osd.5
+  - client.0
+tasks:
+- ceph:
+    log-whitelist:
+    - wrongly marked me down
+- thrashosds:
+    op_delay: 30
+    clean_interval: 120
+    chance_down: .5
+- ceph-fuse:
+- workunit:
+    clients:
+      all:
+      - rados/load-gen-mix-small.sh

diff --git a/suites/rados/singleton/fs/btrfs.yaml b/suites/rados/singleton/fs/btrfs.yaml
new file mode 100644 (file)
index 0000000..0e9746f
--- /dev/null
+++ b/suites/rados/singleton/fs/btrfs.yaml
@@ -0,0 +1,3 @@
+overrides:
+  ceph:
+    fs: btrfs

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

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

diff --git a/suites/rados/thrash/fs/ext4.yaml b/suites/rados/thrash/fs/ext4.yaml
new file mode 100644 (file)
index 0000000..fde6751
--- /dev/null
+++ b/suites/rados/thrash/fs/ext4.yaml
@@ -0,0 +1,3 @@
+overrides:
+  ceph:
+    fs: ext4

diff --git a/suites/rados/thrash/fs/xfs.yaml b/suites/rados/thrash/fs/xfs.yaml
new file mode 100644 (file)
index 0000000..bfc3d61
--- /dev/null
+++ b/suites/rados/thrash/fs/xfs.yaml
@@ -0,0 +1,3 @@
+overrides:
+  ceph:
+    fs: xfs

diff --git a/suites/rados/thrash/thrashers/default.yaml b/suites/rados/thrash/thrashers/default.yaml
new file mode 100644 (file)
index 0000000..e3f9001
--- /dev/null
+++ b/suites/rados/thrash/thrashers/default.yaml
@@ -0,0 +1,7 @@
+tasks:
+- ceph:
+    log-whitelist:
+    - wrongly marked me down
+    - objects unfound and apparently lost
+- thrashosds:
+    timeout: 1200

diff --git a/suites/rados/thrash/workloads/admin_socket_objecter_requests.yaml b/suites/rados/thrash/workloads/admin_socket_objecter_requests.yaml
new file mode 100644 (file)
index 0000000..bccd0b3
--- /dev/null
+++ b/suites/rados/thrash/workloads/admin_socket_objecter_requests.yaml
@@ -0,0 +1,8 @@
+tasks:
+- radosbench:
+    clients: [client.0]
+    time: 60
+- admin_socket:
+    client.0:
+      objecter_requests:
+        test: "http://ceph.newdream.net/git/?p=ceph.git;a=blob_plain;f=src/test/admin_socket/objecter_requests;hb=HEAD"

diff --git a/suites/rados/thrash/workloads/rados_api_tests.yaml b/suites/rados/thrash/workloads/rados_api_tests.yaml
new file mode 100644 (file)
index 0000000..b4708eb
--- /dev/null
+++ b/suites/rados/thrash/workloads/rados_api_tests.yaml
@@ -0,0 +1,6 @@
+tasks:
+- ceph-fuse:
+- workunit:
+    clients:
+      client.0:
+        - rados/test.sh

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

diff --git a/suites/rados/thrash/workloads/readwrite.yaml b/suites/rados/thrash/workloads/readwrite.yaml
new file mode 100644 (file)
index 0000000..c53e52b
--- /dev/null
+++ b/suites/rados/thrash/workloads/readwrite.yaml
@@ -0,0 +1,9 @@
+tasks:
+- rados:
+    clients: [client.0]
+    ops: 4000
+    objects: 500
+    op_weights:
+      read: 45
+      write: 45
+      delete: 10

diff --git a/suites/rados/thrash/workloads/snaps-few-objects.yaml b/suites/rados/thrash/workloads/snaps-few-objects.yaml
new file mode 100644 (file)
index 0000000..561bf19
--- /dev/null
+++ b/suites/rados/thrash/workloads/snaps-few-objects.yaml
@@ -0,0 +1,12 @@
+tasks:
+- rados:
+    clients: [client.0]
+    ops: 4000
+    objects: 50
+    op_weights:
+      read: 100
+      write: 100
+      delete: 50
+      snap_create: 50
+      snap_remove: 50
+      snap_rollback: 50

diff --git a/suites/rados/thrash/workloads/snaps-many-objects.yaml b/suites/rados/thrash/workloads/snaps-many-objects.yaml
new file mode 100644 (file)
index 0000000..bb0c500
--- /dev/null
+++ b/suites/rados/thrash/workloads/snaps-many-objects.yaml
@@ -0,0 +1,12 @@
+tasks:
+- rados:
+    clients: [client.0]
+    ops: 4000
+    objects: 500
+    op_weights:
+      read: 100
+      write: 100
+      delete: 50
+      snap_create: 50
+      snap_remove: 50
+      snap_rollback: 50

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

diff --git a/suites/rados/verify/fs/btrfs.yaml b/suites/rados/verify/fs/btrfs.yaml
new file mode 100644 (file)
index 0000000..0e9746f
--- /dev/null
+++ b/suites/rados/verify/fs/btrfs.yaml
@@ -0,0 +1,3 @@
+overrides:
+  ceph:
+    fs: btrfs

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

diff --git a/suites/rados/verify/tasks/rados_api_tests.yaml b/suites/rados/verify/tasks/rados_api_tests.yaml
new file mode 100644 (file)
index 0000000..32ac50a
--- /dev/null
+++ b/suites/rados/verify/tasks/rados_api_tests.yaml
@@ -0,0 +1,7 @@
+tasks:
+- ceph:
+- ceph-fuse:
+- workunit:
+    clients:
+      client.0:
+        - rados/test.sh

diff --git a/suites/rados/verify/tasks/rgw_s3tests.yaml b/suites/rados/verify/tasks/rgw_s3tests.yaml
new file mode 100644 (file)
index 0000000..c99c85f
--- /dev/null
+++ b/suites/rados/verify/tasks/rgw_s3tests.yaml
@@ -0,0 +1,8 @@
+tasks:
+- ceph:
+- rgw:
+    client.0:
+      valgrind: [--tool=memcheck]
+- s3tests:
+    client.0:
+      rgw_server: client.0

diff --git a/suites/rados/verify/validater/lockdep.yaml b/suites/rados/verify/validater/lockdep.yaml
new file mode 100644 (file)
index 0000000..25f8435
--- /dev/null
+++ b/suites/rados/verify/validater/lockdep.yaml
@@ -0,0 +1,5 @@
+overrides:
+  ceph:
+    conf:
+      global:
+        lockdep: true

diff --git a/suites/rados/verify/validater/valgrind.yaml b/suites/rados/verify/validater/valgrind.yaml
new file mode 100644 (file)
index 0000000..2cbef8a
--- /dev/null
+++ b/suites/rados/verify/validater/valgrind.yaml
@@ -0,0 +1,6 @@
+overrides:
+  ceph:
+    valgrind:
+      mon: [--tool=memcheck]
+      osd: [--tool=memcheck]
+      mds: [--tool=memcheck]

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

diff --git a/suites/rbd/basic/fs/btrfs.yaml b/suites/rbd/basic/fs/btrfs.yaml
new file mode 100644 (file)
index 0000000..0e9746f
--- /dev/null
+++ b/suites/rbd/basic/fs/btrfs.yaml
@@ -0,0 +1,3 @@
+overrides:
+  ceph:
+    fs: btrfs

diff --git a/suites/rbd/basic/tasks/rbd_api_tests_old_format.yaml b/suites/rbd/basic/tasks/rbd_api_tests_old_format.yaml
new file mode 100644 (file)
index 0000000..f1590db
--- /dev/null
+++ b/suites/rbd/basic/tasks/rbd_api_tests_old_format.yaml
@@ -0,0 +1,7 @@
+tasks:
+- ceph:
+- ceph-fuse:
+- workunit:
+    clients:
+      client.0:
+        - rbd/test_librbd.sh

diff --git a/suites/rbd/basic/tasks/rbd_cli_copy.yaml b/suites/rbd/basic/tasks/rbd_cli_copy.yaml
new file mode 100644 (file)
index 0000000..02db273
--- /dev/null
+++ b/suites/rbd/basic/tasks/rbd_cli_copy.yaml
@@ -0,0 +1,9 @@
+tasks:
+- ceph:
+- ceph-fuse:
+- workunit:
+    clients:
+      client.0:
+        - rbd/copy.sh
+    env:
+      RBD_CREATE_ARGS: --new-format

diff --git a/suites/rbd/basic/tasks/rbd_cli_copy_old_format.yaml b/suites/rbd/basic/tasks/rbd_cli_copy_old_format.yaml
new file mode 100644 (file)
index 0000000..8e6ce81
--- /dev/null
+++ b/suites/rbd/basic/tasks/rbd_cli_copy_old_format.yaml
@@ -0,0 +1,7 @@
+tasks:
+- ceph:
+- ceph-fuse:
+- workunit:
+    clients:
+      client.0:
+        - rbd/copy.sh

diff --git a/suites/rbd/basic/tasks/rbd_cli_import_export.yaml b/suites/rbd/basic/tasks/rbd_cli_import_export.yaml
new file mode 100644 (file)
index 0000000..09f8de9
--- /dev/null
+++ b/suites/rbd/basic/tasks/rbd_cli_import_export.yaml
@@ -0,0 +1,9 @@
+tasks:
+- ceph:
+- ceph-fuse:
+- workunit:
+    clients:
+      client.0:
+        - rbd/import_export.sh
+    env:
+      RBD_CREATE_ARGS: --new-format

diff --git a/suites/rbd/basic/tasks/rbd_cli_import_export_old_format.yaml b/suites/rbd/basic/tasks/rbd_cli_import_export_old_format.yaml
new file mode 100644 (file)
index 0000000..aa22498
--- /dev/null
+++ b/suites/rbd/basic/tasks/rbd_cli_import_export_old_format.yaml
@@ -0,0 +1,7 @@
+tasks:
+- ceph:
+- ceph-fuse:
+- workunit:
+    clients:
+      client.0:
+        - rbd/import_export.sh

diff --git a/suites/rbd/basic/tasks/rbd_cls_tests.yaml b/suites/rbd/basic/tasks/rbd_cls_tests.yaml
new file mode 100644 (file)
index 0000000..0c65ece
--- /dev/null
+++ b/suites/rbd/basic/tasks/rbd_cls_tests.yaml
@@ -0,0 +1,7 @@
+tasks:
+- ceph:
+- ceph-fuse:
+- workunit:
+    clients:
+      client.0:
+        - rbd/test_cls_rbd.sh

diff --git a/suites/rbd/basic/tasks/rbd_python_api_tests_old_format.yaml b/suites/rbd/basic/tasks/rbd_python_api_tests_old_format.yaml
new file mode 100644 (file)
index 0000000..e81dcff
--- /dev/null
+++ b/suites/rbd/basic/tasks/rbd_python_api_tests_old_format.yaml
@@ -0,0 +1,7 @@
+tasks:
+- ceph:
+- ceph-fuse:
+- workunit:
+    clients:
+      client.0:
+        - rbd/test_librbd_python.sh

diff --git a/suites/rbd/librbd/cache/none.yaml b/suites/rbd/librbd/cache/none.yaml
new file mode 100644 (file)
index 0000000..da735f1
--- /dev/null
+++ b/suites/rbd/librbd/cache/none.yaml
@@ -0,0 +1,5 @@
+task:
+- ceph:
+    conf:
+      client:
+        rbd cache: false

diff --git a/suites/rbd/librbd/cache/writeback.yaml b/suites/rbd/librbd/cache/writeback.yaml
new file mode 100644 (file)
index 0000000..b907a0a
--- /dev/null
+++ b/suites/rbd/librbd/cache/writeback.yaml
@@ -0,0 +1,5 @@
+task:
+- ceph:
+    conf:
+      client:
+        rbd cache: true

diff --git a/suites/rbd/librbd/cache/writethrough.yaml b/suites/rbd/librbd/cache/writethrough.yaml
new file mode 100644 (file)
index 0000000..d98e277
--- /dev/null
+++ b/suites/rbd/librbd/cache/writethrough.yaml
@@ -0,0 +1,6 @@
+task:
+- ceph:
+    conf:
+      client:
+        rbd cache: true
+        rbd cache max dirty: 0

diff --git a/suites/rbd/librbd/ceph/ceph.yaml b/suites/rbd/librbd/ceph/ceph.yaml
new file mode 100644 (file)
index 0000000..5df450d
--- /dev/null
+++ b/suites/rbd/librbd/ceph/ceph.yaml
@@ -0,0 +1,2 @@
+tasks:
+- ceph:

diff --git a/suites/rbd/librbd/clusters b/suites/rbd/librbd/clusters
new file mode 120000 (symlink)
index 0000000..2be59c6
--- /dev/null
+++ b/suites/rbd/librbd/clusters
@@ -0,0 +1 @@
+../basic/clusters/
\ No newline at end of file

diff --git a/suites/rbd/librbd/fs b/suites/rbd/librbd/fs
new file mode 120000 (symlink)
index 0000000..3658920
--- /dev/null
+++ b/suites/rbd/librbd/fs
@@ -0,0 +1 @@
+../basic/fs
\ No newline at end of file

diff --git a/suites/rbd/librbd/workloads/c_api_tests.yaml b/suites/rbd/librbd/workloads/c_api_tests.yaml
new file mode 100644 (file)
index 0000000..f94a6d9
--- /dev/null
+++ b/suites/rbd/librbd/workloads/c_api_tests.yaml
@@ -0,0 +1,8 @@
+tasks:
+- ceph-fuse:
+- workunit:
+    clients:
+      client.0:
+        - rbd/test_librbd.sh
+    env:
+      RBD_FEATURES: "1"

diff --git a/suites/rbd/librbd/workloads/fsx.yaml b/suites/rbd/librbd/workloads/fsx.yaml
new file mode 100644 (file)
index 0000000..6d8cd5f
--- /dev/null
+++ b/suites/rbd/librbd/workloads/fsx.yaml
@@ -0,0 +1,4 @@
+tasks:
+- rbd_fsx:
+    clients: [client.0]
+    ops: 20000

diff --git a/suites/rbd/librbd/workloads/python_api_tests.yaml b/suites/rbd/librbd/workloads/python_api_tests.yaml
new file mode 100644 (file)
index 0000000..5b036b3
--- /dev/null
+++ b/suites/rbd/librbd/workloads/python_api_tests.yaml
@@ -0,0 +1,8 @@
+tasks:
+- ceph-fuse:
+- workunit:
+    clients:
+      client.0:
+        - rbd/test_librbd_python.sh
+    env:
+      RBD_FEATURES: "1"

diff --git a/suites/rbd/librbd/workloads/qemu_bonnie.yaml b/suites/rbd/librbd/workloads/qemu_bonnie.yaml
new file mode 100644 (file)
index 0000000..8c65bc2
--- /dev/null
+++ b/suites/rbd/librbd/workloads/qemu_bonnie.yaml
@@ -0,0 +1,4 @@
+tasks:
+- qemu:
+    all:
+      test: https://raw.github.com/ceph/ceph/master/qa/workunits/suites/bonnie.sh

diff --git a/suites/rbd/librbd/workloads/qemu_fsstress.yaml b/suites/rbd/librbd/workloads/qemu_fsstress.yaml
new file mode 100644 (file)
index 0000000..35d0932
--- /dev/null
+++ b/suites/rbd/librbd/workloads/qemu_fsstress.yaml
@@ -0,0 +1,4 @@
+tasks:
+- qemu:
+    all:
+      test: https://raw.github.com/ceph/ceph/master/qa/workunits/suites/fsstress.sh

diff --git a/suites/rbd/librbd/workloads/qemu_tiobench.yaml b/suites/rbd/librbd/workloads/qemu_tiobench.yaml
new file mode 100644 (file)
index 0000000..faa1764
--- /dev/null
+++ b/suites/rbd/librbd/workloads/qemu_tiobench.yaml
@@ -0,0 +1,4 @@
+tasks:
+- qemu:
+    all:
+      test: https://raw.github.com/ceph/ceph/master/qa/workunits/suites/tiobench.sh

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

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

diff --git a/suites/rbd/thrash/fs/ext4.yaml b/suites/rbd/thrash/fs/ext4.yaml
new file mode 100644 (file)
index 0000000..fde6751
--- /dev/null
+++ b/suites/rbd/thrash/fs/ext4.yaml
@@ -0,0 +1,3 @@
+overrides:
+  ceph:
+    fs: ext4

diff --git a/suites/rbd/thrash/fs/xfs.yaml b/suites/rbd/thrash/fs/xfs.yaml
new file mode 100644 (file)
index 0000000..bfc3d61
--- /dev/null
+++ b/suites/rbd/thrash/fs/xfs.yaml
@@ -0,0 +1,3 @@
+overrides:
+  ceph:
+    fs: xfs

diff --git a/suites/rbd/thrash/thrashers/default.yaml b/suites/rbd/thrash/thrashers/default.yaml
new file mode 100644 (file)
index 0000000..e3f9001
--- /dev/null
+++ b/suites/rbd/thrash/thrashers/default.yaml
@@ -0,0 +1,7 @@
+tasks:
+- ceph:
+    log-whitelist:
+    - wrongly marked me down
+    - objects unfound and apparently lost
+- thrashosds:
+    timeout: 1200

diff --git a/suites/rbd/thrash/workloads/rbd_api_tests.yaml b/suites/rbd/thrash/workloads/rbd_api_tests.yaml
new file mode 100644 (file)
index 0000000..f94a6d9
--- /dev/null
+++ b/suites/rbd/thrash/workloads/rbd_api_tests.yaml
@@ -0,0 +1,8 @@
+tasks:
+- ceph-fuse:
+- workunit:
+    clients:
+      client.0:
+        - rbd/test_librbd.sh
+    env:
+      RBD_FEATURES: "1"

diff --git a/suites/rbd/thrash/workloads/rbd_fsx_cache_writeback.yaml b/suites/rbd/thrash/workloads/rbd_fsx_cache_writeback.yaml
new file mode 100644 (file)
index 0000000..c603fff
--- /dev/null
+++ b/suites/rbd/thrash/workloads/rbd_fsx_cache_writeback.yaml
@@ -0,0 +1,9 @@
+tasks:
+- rbd_fsx:
+    clients: [client.0]
+    ops: 20000
+overrides:
+  ceph:
+    conf:
+      client:
+        rbd cache: true

diff --git a/suites/rbd/thrash/workloads/rbd_fsx_cache_writethrough.yaml b/suites/rbd/thrash/workloads/rbd_fsx_cache_writethrough.yaml
new file mode 100644 (file)
index 0000000..fa9e818
--- /dev/null
+++ b/suites/rbd/thrash/workloads/rbd_fsx_cache_writethrough.yaml
@@ -0,0 +1,10 @@
+tasks:
+- rbd_fsx:
+    clients: [client.0]
+    ops: 20000
+overrides:
+  ceph:
+    conf:
+      client:
+        rbd cache: true
+        rbd cache max dirty: 0

diff --git a/suites/rbd/thrash/workloads/rbd_fsx_nocache.yaml b/suites/rbd/thrash/workloads/rbd_fsx_nocache.yaml
new file mode 100644 (file)
index 0000000..120ec00
--- /dev/null
+++ b/suites/rbd/thrash/workloads/rbd_fsx_nocache.yaml
@@ -0,0 +1,9 @@
+tasks:
+- rbd_fsx:
+    clients: [client.0]
+    ops: 20000
+overrides:
+  ceph:
+    conf:
+      client:
+        rbd cache: false

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

diff --git a/suites/regression/basic/fs/btrfs.yaml b/suites/regression/basic/fs/btrfs.yaml
deleted file mode 100644 (file)
index 0e9746f..0000000
--- a/suites/regression/basic/fs/btrfs.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-overrides:
-  ceph:
-    fs: btrfs

diff --git a/suites/regression/basic/tasks/cfuse_workunit_kernel_untar_build.yaml b/suites/regression/basic/tasks/cfuse_workunit_kernel_untar_build.yaml
deleted file mode 100644 (file)
index 6f048f8..0000000
--- a/suites/regression/basic/tasks/cfuse_workunit_kernel_untar_build.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- ceph:
-- ceph-fuse:
-- workunit:
-    clients:
-      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
deleted file mode 100644 (file)
index d8d1a00..0000000
--- a/suites/regression/basic/tasks/cfuse_workunit_misc.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- ceph:
-- ceph-fuse:
-- workunit:
-    clients:
-      all:
-        - misc

diff --git a/suites/regression/basic/tasks/cfuse_workunit_suites_blogbench.yaml b/suites/regression/basic/tasks/cfuse_workunit_suites_blogbench.yaml
deleted file mode 100644 (file)
index 4c9ff41..0000000
--- a/suites/regression/basic/tasks/cfuse_workunit_suites_blogbench.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- ceph:
-- ceph-fuse:
-- workunit:
-    clients:
-      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
deleted file mode 100644 (file)
index 2d64f63..0000000
--- a/suites/regression/basic/tasks/cfuse_workunit_suites_dbench.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- ceph:
-- ceph-fuse:
-- workunit:
-    clients:
-      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
deleted file mode 100644 (file)
index 22cf239..0000000
--- a/suites/regression/basic/tasks/cfuse_workunit_suites_ffsb.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- ceph:
-- ceph-fuse:
-- workunit:
-    clients:
-      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
deleted file mode 100644 (file)
index 8f0bc59..0000000
--- a/suites/regression/basic/tasks/cfuse_workunit_suites_fsstress.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- ceph:
-- ceph-fuse:
-- workunit:
-    clients:
-      all:
-        - suites/fsstress.sh

diff --git a/suites/regression/basic/tasks/cfuse_workunit_suites_fsx.yaml b/suites/regression/basic/tasks/cfuse_workunit_suites_fsx.yaml
deleted file mode 100644 (file)
index 9b59a22..0000000
--- a/suites/regression/basic/tasks/cfuse_workunit_suites_fsx.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- ceph:
-- ceph-fuse:
-- workunit:
-    clients:
-      all:
-        - suites/fsx.sh

diff --git a/suites/regression/basic/tasks/cfuse_workunit_suites_iozone.yaml b/suites/regression/basic/tasks/cfuse_workunit_suites_iozone.yaml
deleted file mode 100644 (file)
index fedc230..0000000
--- a/suites/regression/basic/tasks/cfuse_workunit_suites_iozone.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- ceph:
-- ceph-fuse: [client.0]
-- workunit:
-    clients:
-      all:
-        - suites/iozone.sh

diff --git a/suites/regression/basic/tasks/cfuse_workunit_suites_pjd.yaml b/suites/regression/basic/tasks/cfuse_workunit_suites_pjd.yaml
deleted file mode 100644 (file)
index d7f729e..0000000
--- a/suites/regression/basic/tasks/cfuse_workunit_suites_pjd.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- ceph:
-- ceph-fuse:
-- workunit:
-    clients:
-      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
deleted file mode 100644 (file)
index 73fc216..0000000
--- a/suites/regression/basic/tasks/cfuse_workunit_suites_tiobench.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- ceph:
-- ceph-fuse:
-- workunit:
-    clients:
-      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
deleted file mode 100644 (file)
index 85c9fd1..0000000
--- a/suites/regression/basic/tasks/cfuse_workunit_trivial_sync.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- ceph:
-- ceph-fuse:
-- workunit:
-    clients:
-      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
deleted file mode 100644 (file)
index 70e9427..0000000
--- a/suites/regression/basic/tasks/libcephfs_interface_tests.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- ceph:
-- ceph-fuse:
-- workunit:
-    clients:
-      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
deleted file mode 100644 (file)
index 32ac50a..0000000
--- a/suites/regression/basic/tasks/rados_api_tests.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- ceph:
-- ceph-fuse:
-- workunit:
-    clients:
-      client.0:
-        - rados/test.sh

diff --git a/suites/regression/basic/tasks/rados_python.yaml b/suites/regression/basic/tasks/rados_python.yaml
deleted file mode 100644 (file)
index a340bf5..0000000
--- a/suites/regression/basic/tasks/rados_python.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- ceph:
-- ceph-fuse:
-- workunit:
-    clients:
-      client.0:
-        - rados/test_python.sh

diff --git a/suites/regression/basic/tasks/rados_stress_watch.yaml b/suites/regression/basic/tasks/rados_stress_watch.yaml
deleted file mode 100644 (file)
index 788f989..0000000
--- a/suites/regression/basic/tasks/rados_stress_watch.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- ceph:
-- ceph-fuse:
-- workunit:
-    clients:
-      client.0:
-        - rados/stress_watch.sh

diff --git a/suites/regression/basic/tasks/rados_workunit_loadgen_big.yaml b/suites/regression/basic/tasks/rados_workunit_loadgen_big.yaml
deleted file mode 100644 (file)
index 7ecc6ed..0000000
--- a/suites/regression/basic/tasks/rados_workunit_loadgen_big.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- ceph:
-- ceph-fuse:
-- workunit:
-    clients:
-      all:
-        - rados/load-gen-big.sh

diff --git a/suites/regression/basic/tasks/rados_workunit_loadgen_mix.yaml b/suites/regression/basic/tasks/rados_workunit_loadgen_mix.yaml
deleted file mode 100644 (file)
index b3c02f0..0000000
--- a/suites/regression/basic/tasks/rados_workunit_loadgen_mix.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- ceph:
-- ceph-fuse:
-- workunit:
-    clients:
-      all:
-        - rados/load-gen-mix.sh

diff --git a/suites/regression/basic/tasks/rados_workunit_loadgen_mostlyread.yaml b/suites/regression/basic/tasks/rados_workunit_loadgen_mostlyread.yaml
deleted file mode 100644 (file)
index 8ed27eb..0000000
--- a/suites/regression/basic/tasks/rados_workunit_loadgen_mostlyread.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- ceph:
-- ceph-fuse:
-- workunit:
-    clients:
-      all:
-        - rados/load-gen-mostlyread.sh

diff --git a/suites/regression/basic/tasks/rbd_api_tests_old_format.yaml b/suites/regression/basic/tasks/rbd_api_tests_old_format.yaml
deleted file mode 100644 (file)
index f1590db..0000000
--- a/suites/regression/basic/tasks/rbd_api_tests_old_format.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- ceph:
-- ceph-fuse:
-- workunit:
-    clients:
-      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
deleted file mode 100644 (file)
index 02db273..0000000
--- a/suites/regression/basic/tasks/rbd_cli_copy.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-tasks:
-- ceph:
-- ceph-fuse:
-- workunit:
-    clients:
-      client.0:
-        - rbd/copy.sh
-    env:
-      RBD_CREATE_ARGS: --new-format

diff --git a/suites/regression/basic/tasks/rbd_cli_copy_old_format.yaml b/suites/regression/basic/tasks/rbd_cli_copy_old_format.yaml
deleted file mode 100644 (file)
index 8e6ce81..0000000
--- a/suites/regression/basic/tasks/rbd_cli_copy_old_format.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- ceph:
-- ceph-fuse:
-- workunit:
-    clients:
-      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
deleted file mode 100644 (file)
index 09f8de9..0000000
--- a/suites/regression/basic/tasks/rbd_cli_import_export.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-tasks:
-- ceph:
-- ceph-fuse:
-- workunit:
-    clients:
-      client.0:
-        - rbd/import_export.sh
-    env:
-      RBD_CREATE_ARGS: --new-format

diff --git a/suites/regression/basic/tasks/rbd_cli_import_export_old_format.yaml b/suites/regression/basic/tasks/rbd_cli_import_export_old_format.yaml
deleted file mode 100644 (file)
index aa22498..0000000
--- a/suites/regression/basic/tasks/rbd_cli_import_export_old_format.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- ceph:
-- ceph-fuse:
-- workunit:
-    clients:
-      client.0:
-        - rbd/import_export.sh

diff --git a/suites/regression/basic/tasks/rbd_cls_tests.yaml b/suites/regression/basic/tasks/rbd_cls_tests.yaml
deleted file mode 100644 (file)
index 0c65ece..0000000
--- a/suites/regression/basic/tasks/rbd_cls_tests.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- ceph:
-- ceph-fuse:
-- workunit:
-    clients:
-      client.0:
-        - rbd/test_cls_rbd.sh

diff --git a/suites/regression/basic/tasks/rbd_python_api_tests_old_format.yaml b/suites/regression/basic/tasks/rbd_python_api_tests_old_format.yaml
deleted file mode 100644 (file)
index e81dcff..0000000
--- a/suites/regression/basic/tasks/rbd_python_api_tests_old_format.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- ceph:
-- ceph-fuse:
-- workunit:
-    clients:
-      client.0:
-        - rbd/test_librbd_python.sh

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

diff --git a/suites/regression/fs-verify b/suites/regression/fs-verify
new file mode 120000 (symlink)
index 0000000..ac93773
--- /dev/null
+++ b/suites/regression/fs-verify
@@ -0,0 +1 @@
+../fs/verify
\ No newline at end of file

diff --git a/suites/regression/librbd/cache/none.yaml b/suites/regression/librbd/cache/none.yaml
deleted file mode 100644 (file)
index da735f1..0000000
--- a/suites/regression/librbd/cache/none.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-task:
-- ceph:
-    conf:
-      client:
-        rbd cache: false

diff --git a/suites/regression/librbd/cache/writeback.yaml b/suites/regression/librbd/cache/writeback.yaml
deleted file mode 100644 (file)
index b907a0a..0000000
--- a/suites/regression/librbd/cache/writeback.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-task:
-- ceph:
-    conf:
-      client:
-        rbd cache: true

diff --git a/suites/regression/librbd/cache/writethrough.yaml b/suites/regression/librbd/cache/writethrough.yaml
deleted file mode 100644 (file)
index d98e277..0000000
--- a/suites/regression/librbd/cache/writethrough.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-task:
-- ceph:
-    conf:
-      client:
-        rbd cache: true
-        rbd cache max dirty: 0

diff --git a/suites/regression/librbd/ceph/ceph.yaml b/suites/regression/librbd/ceph/ceph.yaml
deleted file mode 100644 (file)
index 5df450d..0000000
--- a/suites/regression/librbd/ceph/ceph.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-tasks:
-- ceph:

diff --git a/suites/regression/librbd/clusters b/suites/regression/librbd/clusters
deleted file mode 120000 (symlink)
index 2be59c6..0000000
--- a/suites/regression/librbd/clusters
+++ /dev/null
@@ -1 +0,0 @@
-../basic/clusters/
\ No newline at end of file

diff --git a/suites/regression/librbd/fs b/suites/regression/librbd/fs
deleted file mode 120000 (symlink)
index 3658920..0000000
--- a/suites/regression/librbd/fs
+++ /dev/null
@@ -1 +0,0 @@
-../basic/fs
\ No newline at end of file

diff --git a/suites/regression/librbd/workloads/c_api_tests.yaml b/suites/regression/librbd/workloads/c_api_tests.yaml
deleted file mode 100644 (file)
index f94a6d9..0000000
--- a/suites/regression/librbd/workloads/c_api_tests.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-tasks:
-- ceph-fuse:
-- workunit:
-    clients:
-      client.0:
-        - rbd/test_librbd.sh
-    env:
-      RBD_FEATURES: "1"

diff --git a/suites/regression/librbd/workloads/fsx.yaml b/suites/regression/librbd/workloads/fsx.yaml
deleted file mode 100644 (file)
index 6d8cd5f..0000000
--- a/suites/regression/librbd/workloads/fsx.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-tasks:
-- rbd_fsx:
-    clients: [client.0]
-    ops: 20000

diff --git a/suites/regression/librbd/workloads/python_api_tests.yaml b/suites/regression/librbd/workloads/python_api_tests.yaml
deleted file mode 100644 (file)
index 5b036b3..0000000
--- a/suites/regression/librbd/workloads/python_api_tests.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-tasks:
-- ceph-fuse:
-- workunit:
-    clients:
-      client.0:
-        - rbd/test_librbd_python.sh
-    env:
-      RBD_FEATURES: "1"

diff --git a/suites/regression/librbd/workloads/qemu_bonnie.yaml b/suites/regression/librbd/workloads/qemu_bonnie.yaml
deleted file mode 100644 (file)
index 8c65bc2..0000000
--- a/suites/regression/librbd/workloads/qemu_bonnie.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-tasks:
-- qemu:
-    all:
-      test: https://raw.github.com/ceph/ceph/master/qa/workunits/suites/bonnie.sh

diff --git a/suites/regression/librbd/workloads/qemu_fsstress.yaml b/suites/regression/librbd/workloads/qemu_fsstress.yaml
deleted file mode 100644 (file)
index 35d0932..0000000
--- a/suites/regression/librbd/workloads/qemu_fsstress.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-tasks:
-- qemu:
-    all:
-      test: https://raw.github.com/ceph/ceph/master/qa/workunits/suites/fsstress.sh

diff --git a/suites/regression/librbd/workloads/qemu_tiobench.yaml b/suites/regression/librbd/workloads/qemu_tiobench.yaml
deleted file mode 100644 (file)
index faa1764..0000000
--- a/suites/regression/librbd/workloads/qemu_tiobench.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-tasks:
-- qemu:
-    all:
-      test: https://raw.github.com/ceph/ceph/master/qa/workunits/suites/tiobench.sh

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

diff --git a/suites/regression/multifs/fs/btrfs.yaml b/suites/regression/multifs/fs/btrfs.yaml
deleted file mode 100644 (file)
index 0e9746f..0000000
--- a/suites/regression/multifs/fs/btrfs.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-overrides:
-  ceph:
-    fs: btrfs

diff --git a/suites/regression/multifs/fs/ext4.yaml b/suites/regression/multifs/fs/ext4.yaml
deleted file mode 100644 (file)
index fde6751..0000000
--- a/suites/regression/multifs/fs/ext4.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-overrides:
-  ceph:
-    fs: ext4

diff --git a/suites/regression/multifs/fs/xfs.yaml b/suites/regression/multifs/fs/xfs.yaml
deleted file mode 100644 (file)
index bfc3d61..0000000
--- a/suites/regression/multifs/fs/xfs.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-overrides:
-  ceph:
-    fs: xfs

diff --git a/suites/regression/multifs/tasks/rgw_readwrite.yaml b/suites/regression/multifs/tasks/rgw_readwrite.yaml
deleted file mode 100644 (file)
index 3e59fc2..0000000
--- a/suites/regression/multifs/tasks/rgw_readwrite.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-tasks:
-- ceph:
-- rgw: [client.0]
-- s3readwrite:
-    client.0:
-      rgw_server: client.0
-      readwrite:
-        bucket: rwtest
-        readers: 10
-        writers: 3
-        duration: 300
-        files:
-          num: 10
-          size: 2000
-          stddev: 500 

diff --git a/suites/regression/multifs/tasks/rgw_roundtrip.yaml b/suites/regression/multifs/tasks/rgw_roundtrip.yaml
deleted file mode 100644 (file)
index 348919b..0000000
--- a/suites/regression/multifs/tasks/rgw_roundtrip.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-tasks:
-- ceph:
-- rgw: [client.0]
-- s3roundtrip:
-    client.0:
-      rgw_server: client.0
-      roundtrip:
-        bucket: rttest
-        readers: 10
-        writers: 3
-        duration: 300
-        files:
-          num: 10
-          size: 2000
-          stddev: 500 

diff --git a/suites/regression/multifs/tasks/rgw_s3tests.yaml b/suites/regression/multifs/tasks/rgw_s3tests.yaml
deleted file mode 100644 (file)
index 13d265d..0000000
--- a/suites/regression/multifs/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/suites/regression/multimon/clusters/21.yaml b/suites/regression/multimon/clusters/21.yaml
deleted file mode 100644 (file)
index 2d13478..0000000
--- a/suites/regression/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/suites/regression/multimon/clusters/3.yaml b/suites/regression/multimon/clusters/3.yaml
deleted file mode 100644 (file)
index 703cc66..0000000
--- a/suites/regression/multimon/clusters/3.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-roles:
-- [mon.a, mon.b, mon.c, osd.0, osd.1, mds.a]

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

diff --git a/suites/regression/multimon/clusters/9.yaml b/suites/regression/multimon/clusters/9.yaml
deleted file mode 100644 (file)
index b87a158..0000000
--- a/suites/regression/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/suites/regression/multimon/tasks/mon_recovery.yaml b/suites/regression/multimon/tasks/mon_recovery.yaml
deleted file mode 100644 (file)
index 6240d4c..0000000
--- a/suites/regression/multimon/tasks/mon_recovery.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-tasks:
-- ceph:
-- mon_recovery:

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

diff --git a/suites/regression/rados-multifs b/suites/regression/rados-multifs
new file mode 120000 (symlink)
index 0000000..283dd18
--- /dev/null
+++ b/suites/regression/rados-multifs
@@ -0,0 +1 @@
+../rados/multifs
\ No newline at end of file

diff --git a/suites/regression/rados-multimon b/suites/regression/rados-multimon
new file mode 120000 (symlink)
index 0000000..183dd50
--- /dev/null
+++ b/suites/regression/rados-multimon
@@ -0,0 +1 @@
+../rados/multimon
\ No newline at end of file

diff --git a/suites/regression/rados-singleton b/suites/regression/rados-singleton
new file mode 120000 (symlink)
index 0000000..211ca68
--- /dev/null
+++ b/suites/regression/rados-singleton
@@ -0,0 +1 @@
+../rados/singleton
\ No newline at end of file

diff --git a/suites/regression/rados-thrash b/suites/regression/rados-thrash
new file mode 120000 (symlink)
index 0000000..e680382
--- /dev/null
+++ b/suites/regression/rados-thrash
@@ -0,0 +1 @@
+../rados/thrash
\ No newline at end of file

diff --git a/suites/regression/rados-verify b/suites/regression/rados-verify
new file mode 120000 (symlink)
index 0000000..ac37107
--- /dev/null
+++ b/suites/regression/rados-verify
@@ -0,0 +1 @@
+../rados/verify
\ No newline at end of file

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

diff --git a/suites/regression/rbd-librbd b/suites/regression/rbd-librbd
new file mode 120000 (symlink)
index 0000000..58f2bd9
--- /dev/null
+++ b/suites/regression/rbd-librbd
@@ -0,0 +1 @@
+../rbd/librbd
\ No newline at end of file

diff --git a/suites/regression/rbd-thrash b/suites/regression/rbd-thrash
new file mode 120000 (symlink)
index 0000000..080dac9
--- /dev/null
+++ b/suites/regression/rbd-thrash
@@ -0,0 +1 @@
+../rbd/thrash
\ No newline at end of file

diff --git a/suites/regression/singleton/all/admin-socket.yaml b/suites/regression/singleton/all/admin-socket.yaml
deleted file mode 100644 (file)
index 24da643..0000000
--- a/suites/regression/singleton/all/admin-socket.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-roles:
-- - mon.a
-  - osd.0
-  - mds.a
-  - osd.1
-  - client.a
-tasks:
-- ceph: null
-- admin_socket:
-    osd.0:
-      version:
-      git_version:
-      help:
-      config show:
-      config set filestore_dump_file /tmp/foo:
-      perf dump:
-      perf schema:

diff --git a/suites/regression/singleton/all/dump-stuck.yaml b/suites/regression/singleton/all/dump-stuck.yaml
deleted file mode 100644 (file)
index 380cded..0000000
--- a/suites/regression/singleton/all/dump-stuck.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-roles:
-- - mon.a
-  - mds.0
-  - osd.0
-  - osd.1
-tasks:
-- ceph:
-    log-whitelist:
-    - wrongly marked me down
-    conf:
-      mon:
-        mon_osd_report_timeout: 90
-        mon_pg_stuck_threshold: 10
-- dump_stuck:

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

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

diff --git a/suites/regression/singleton/all/osd-backfill.yaml b/suites/regression/singleton/all/osd-backfill.yaml
deleted file mode 100644 (file)
index a8161e9..0000000
--- a/suites/regression/singleton/all/osd-backfill.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-roles:
-- - mon.a
-  - mon.b
-  - mon.c
-  - mds.a
-  - osd.0
-  - osd.1
-  - osd.2
-tasks:
-- ceph:
-    log-whitelist:
-    - wrongly marked me down
-    conf:
-      osd:
-        osd min pg log entries: 5
-- osd_backfill:

diff --git a/suites/regression/singleton/all/osd-recovery-incomplete.yaml b/suites/regression/singleton/all/osd-recovery-incomplete.yaml
deleted file mode 100644 (file)
index 6e4a4d7..0000000
--- a/suites/regression/singleton/all/osd-recovery-incomplete.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-roles:
-- - mon.a
-  - mon.b
-  - mon.c
-  - mds.a
-  - osd.0
-  - osd.1
-  - osd.2
-  - osd.3
-tasks:
-- ceph:
-    log-whitelist:
-    - wrongly marked me down
-    conf:
-      osd:
-        osd min pg log entries: 5
-- osd_recovery.test_incomplete_pgs:

diff --git a/suites/regression/singleton/all/osd-recovery.yaml b/suites/regression/singleton/all/osd-recovery.yaml
deleted file mode 100644 (file)
index 65c0f6b..0000000
--- a/suites/regression/singleton/all/osd-recovery.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-roles:
-- - mon.a
-  - mon.b
-  - mon.c
-  - mds.a
-  - osd.0
-  - osd.1
-  - osd.2
-tasks:
-- ceph:
-    log-whitelist:
-    - wrongly marked me down
-    conf:
-      osd:
-        osd min pg log entries: 5
-- osd_recovery:

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

diff --git a/suites/regression/singleton/all/radosgw-admin.yaml b/suites/regression/singleton/all/radosgw-admin.yaml
deleted file mode 100644 (file)
index 231bc4b..0000000
--- a/suites/regression/singleton/all/radosgw-admin.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-roles:
-- [mon.a, mds.a, osd.0, client.0, osd.1]
-tasks:
-- ceph:
-- rgw:
-    client.0:
-- radosgw-admin:

diff --git a/suites/regression/singleton/all/thrash-rados.yaml b/suites/regression/singleton/all/thrash-rados.yaml
deleted file mode 100644 (file)
index a4b14d6..0000000
--- a/suites/regression/singleton/all/thrash-rados.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-roles:
-- - mon.a
-  - mds.0
-  - osd.0
-  - osd.1
-  - osd.2
-- - osd.3
-  - osd.4
-  - osd.5
-  - client.0
-tasks:
-- ceph:
-    log-whitelist:
-    - wrongly marked me down
-- thrashosds:
-    op_delay: 30
-    clean_interval: 120
-    chance_down: .5
-- ceph-fuse:
-- workunit:
-    clients:
-      all:
-      - rados/load-gen-mix-small.sh

diff --git a/suites/regression/singleton/fs/btrfs.yaml b/suites/regression/singleton/fs/btrfs.yaml
deleted file mode 100644 (file)
index 0e9746f..0000000
--- a/suites/regression/singleton/fs/btrfs.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-overrides:
-  ceph:
-    fs: btrfs

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

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

diff --git a/suites/regression/thrash/fs/ext4.yaml b/suites/regression/thrash/fs/ext4.yaml
deleted file mode 100644 (file)
index fde6751..0000000
--- a/suites/regression/thrash/fs/ext4.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-overrides:
-  ceph:
-    fs: ext4

diff --git a/suites/regression/thrash/fs/xfs.yaml b/suites/regression/thrash/fs/xfs.yaml
deleted file mode 100644 (file)
index bfc3d61..0000000
--- a/suites/regression/thrash/fs/xfs.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-overrides:
-  ceph:
-    fs: xfs

diff --git a/suites/regression/thrash/thrashers/default.yaml b/suites/regression/thrash/thrashers/default.yaml
deleted file mode 100644 (file)
index e3f9001..0000000
--- a/suites/regression/thrash/thrashers/default.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- ceph:
-    log-whitelist:
-    - wrongly marked me down
-    - objects unfound and apparently lost
-- thrashosds:
-    timeout: 1200

diff --git a/suites/regression/thrash/workloads/admin_socket_objecter_requests.yaml b/suites/regression/thrash/workloads/admin_socket_objecter_requests.yaml
deleted file mode 100644 (file)
index bccd0b3..0000000
--- a/suites/regression/thrash/workloads/admin_socket_objecter_requests.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-tasks:
-- radosbench:
-    clients: [client.0]
-    time: 60
-- admin_socket:
-    client.0:
-      objecter_requests:
-        test: "http://ceph.newdream.net/git/?p=ceph.git;a=blob_plain;f=src/test/admin_socket/objecter_requests;hb=HEAD"

diff --git a/suites/regression/thrash/workloads/rados_api_tests.yaml b/suites/regression/thrash/workloads/rados_api_tests.yaml
deleted file mode 100644 (file)
index b4708eb..0000000
--- a/suites/regression/thrash/workloads/rados_api_tests.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- ceph-fuse:
-- workunit:
-    clients:
-      client.0:
-        - rados/test.sh

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

diff --git a/suites/regression/thrash/workloads/rbd_api_tests.yaml b/suites/regression/thrash/workloads/rbd_api_tests.yaml
deleted file mode 100644 (file)
index f94a6d9..0000000
--- a/suites/regression/thrash/workloads/rbd_api_tests.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-tasks:
-- ceph-fuse:
-- workunit:
-    clients:
-      client.0:
-        - rbd/test_librbd.sh
-    env:
-      RBD_FEATURES: "1"

diff --git a/suites/regression/thrash/workloads/rbd_fsx_cache_writeback.yaml b/suites/regression/thrash/workloads/rbd_fsx_cache_writeback.yaml
deleted file mode 100644 (file)
index c603fff..0000000
--- a/suites/regression/thrash/workloads/rbd_fsx_cache_writeback.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-tasks:
-- rbd_fsx:
-    clients: [client.0]
-    ops: 20000
-overrides:
-  ceph:
-    conf:
-      client:
-        rbd cache: true

diff --git a/suites/regression/thrash/workloads/rbd_fsx_cache_writethrough.yaml b/suites/regression/thrash/workloads/rbd_fsx_cache_writethrough.yaml
deleted file mode 100644 (file)
index fa9e818..0000000
--- a/suites/regression/thrash/workloads/rbd_fsx_cache_writethrough.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-tasks:
-- rbd_fsx:
-    clients: [client.0]
-    ops: 20000
-overrides:
-  ceph:
-    conf:
-      client:
-        rbd cache: true
-        rbd cache max dirty: 0

diff --git a/suites/regression/thrash/workloads/rbd_fsx_nocache.yaml b/suites/regression/thrash/workloads/rbd_fsx_nocache.yaml
deleted file mode 100644 (file)
index 120ec00..0000000
--- a/suites/regression/thrash/workloads/rbd_fsx_nocache.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-tasks:
-- rbd_fsx:
-    clients: [client.0]
-    ops: 20000
-overrides:
-  ceph:
-    conf:
-      client:
-        rbd cache: false

diff --git a/suites/regression/thrash/workloads/readwrite.yaml b/suites/regression/thrash/workloads/readwrite.yaml
deleted file mode 100644 (file)
index c53e52b..0000000
--- a/suites/regression/thrash/workloads/readwrite.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-tasks:
-- rados:
-    clients: [client.0]
-    ops: 4000
-    objects: 500
-    op_weights:
-      read: 45
-      write: 45
-      delete: 10

diff --git a/suites/regression/thrash/workloads/snaps-few-objects.yaml b/suites/regression/thrash/workloads/snaps-few-objects.yaml
deleted file mode 100644 (file)
index 561bf19..0000000
--- a/suites/regression/thrash/workloads/snaps-few-objects.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-tasks:
-- rados:
-    clients: [client.0]
-    ops: 4000
-    objects: 50
-    op_weights:
-      read: 100
-      write: 100
-      delete: 50
-      snap_create: 50
-      snap_remove: 50
-      snap_rollback: 50

diff --git a/suites/regression/thrash/workloads/snaps-many-objects.yaml b/suites/regression/thrash/workloads/snaps-many-objects.yaml
deleted file mode 100644 (file)
index bb0c500..0000000
--- a/suites/regression/thrash/workloads/snaps-many-objects.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-tasks:
-- rados:
-    clients: [client.0]
-    ops: 4000
-    objects: 500
-    op_weights:
-      read: 100
-      write: 100
-      delete: 50
-      snap_create: 50
-      snap_remove: 50
-      snap_rollback: 50

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

diff --git a/suites/regression/verify/fs/btrfs.yaml b/suites/regression/verify/fs/btrfs.yaml
deleted file mode 100644 (file)
index 0e9746f..0000000
--- a/suites/regression/verify/fs/btrfs.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-overrides:
-  ceph:
-    fs: btrfs

diff --git a/suites/regression/verify/tasks/cfuse_workunit_suites_dbench.yaml b/suites/regression/verify/tasks/cfuse_workunit_suites_dbench.yaml
deleted file mode 100644 (file)
index e96ba01..0000000
--- a/suites/regression/verify/tasks/cfuse_workunit_suites_dbench.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-tasks:
-- ceph:
-    conf:
-      client:
-        debug client: 1/20
-        debug ms: 0/10
-- ceph-fuse:
-- workunit:
-    clients:
-      all:
-        - suites/dbench.sh

diff --git a/suites/regression/verify/tasks/cfuse_workunit_suites_fsstress.yaml b/suites/regression/verify/tasks/cfuse_workunit_suites_fsstress.yaml
deleted file mode 100644 (file)
index 8f0bc59..0000000
--- a/suites/regression/verify/tasks/cfuse_workunit_suites_fsstress.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- ceph:
-- ceph-fuse:
-- workunit:
-    clients:
-      all:
-        - suites/fsstress.sh

diff --git a/suites/regression/verify/tasks/libcephfs_interface_tests.yaml b/suites/regression/verify/tasks/libcephfs_interface_tests.yaml
deleted file mode 100644 (file)
index 70e9427..0000000
--- a/suites/regression/verify/tasks/libcephfs_interface_tests.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- ceph:
-- ceph-fuse:
-- workunit:
-    clients:
-      client.0:
-        - libcephfs/test.sh

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

diff --git a/suites/regression/verify/tasks/rados_api_tests.yaml b/suites/regression/verify/tasks/rados_api_tests.yaml
deleted file mode 100644 (file)
index 32ac50a..0000000
--- a/suites/regression/verify/tasks/rados_api_tests.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- ceph:
-- ceph-fuse:
-- workunit:
-    clients:
-      client.0:
-        - rados/test.sh

diff --git a/suites/regression/verify/tasks/rgw_s3tests.yaml b/suites/regression/verify/tasks/rgw_s3tests.yaml
deleted file mode 100644 (file)
index c99c85f..0000000
--- a/suites/regression/verify/tasks/rgw_s3tests.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-tasks:
-- ceph:
-- rgw:
-    client.0:
-      valgrind: [--tool=memcheck]
-- s3tests:
-    client.0:
-      rgw_server: client.0

diff --git a/suites/regression/verify/validater/lockdep.yaml b/suites/regression/verify/validater/lockdep.yaml
deleted file mode 100644 (file)
index 25f8435..0000000
--- a/suites/regression/verify/validater/lockdep.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-overrides:
-  ceph:
-    conf:
-      global:
-        lockdep: true

diff --git a/suites/regression/verify/validater/valgrind.yaml b/suites/regression/verify/validater/valgrind.yaml
deleted file mode 100644 (file)
index 2cbef8a..0000000
--- a/suites/regression/verify/validater/valgrind.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-overrides:
-  ceph:
-    valgrind:
-      mon: [--tool=memcheck]
-      osd: [--tool=memcheck]
-      mds: [--tool=memcheck]