qa: merge workload tests from kcephfs with fs

Fixes: https://tracker.ceph.com/issues/23718
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>

diff --git a/qa/suites/fs/basic_workload/clusters/1-mds-1-client.yaml b/qa/suites/fs/basic_workload/clusters/1-mds-1-client.yaml
new file mode 120000 (symlink)
index 0000000..64bdb79
--- /dev/null
+++ b/qa/suites/fs/basic_workload/clusters/1-mds-1-client.yaml
@@ -0,0 +1 @@
+.qa/cephfs/clusters/1-mds-1-client.yaml
\ No newline at end of file

diff --git a/qa/suites/fs/basic_workload/clusters/fixed-2-ucephfs.yaml b/qa/suites/fs/basic_workload/clusters/fixed-2-ucephfs.yaml
deleted file mode 120000 (symlink)
index b0c41a8..0000000
--- a/qa/suites/fs/basic_workload/clusters/fixed-2-ucephfs.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/clusters/fixed-2-ucephfs.yaml
\ No newline at end of file

diff --git a/qa/suites/fs/basic_workload/mount b/qa/suites/fs/basic_workload/mount
new file mode 120000 (symlink)
index 0000000..e3600f4
--- /dev/null
+++ b/qa/suites/fs/basic_workload/mount
@@ -0,0 +1 @@
+.qa/cephfs/mount/
\ No newline at end of file

diff --git a/qa/suites/fs/basic_workload/mount/.qa b/qa/suites/fs/basic_workload/mount/.qa
deleted file mode 120000 (symlink)
index a602a03..0000000
--- a/qa/suites/fs/basic_workload/mount/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/
\ No newline at end of file

diff --git a/qa/suites/fs/basic_workload/mount/fuse.yaml b/qa/suites/fs/basic_workload/mount/fuse.yaml
deleted file mode 120000 (symlink)
index 0e55da9..0000000
--- a/qa/suites/fs/basic_workload/mount/fuse.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/mount/fuse.yaml
\ No newline at end of file

diff --git a/qa/suites/fs/basic_workload/overrides/osd-asserts.yaml b/qa/suites/fs/basic_workload/overrides/osd-asserts.yaml
new file mode 120000 (symlink)
index 0000000..f290c74
--- /dev/null
+++ b/qa/suites/fs/basic_workload/overrides/osd-asserts.yaml
@@ -0,0 +1 @@
+.qa/cephfs/overrides/osd-asserts.yaml
\ No newline at end of file

diff --git a/qa/suites/fs/basic_workload/tasks/cfuse_workunit_kernel_untar_build.yaml b/qa/suites/fs/basic_workload/tasks/cfuse_workunit_kernel_untar_build.yaml
deleted file mode 100644 (file)
index 1e71bb4..0000000
--- a/qa/suites/fs/basic_workload/tasks/cfuse_workunit_kernel_untar_build.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-overrides:
-  ceph:
-    conf:
-      client:
-        fuse_default_permissions: 0
-tasks:
-- check-counter:
-    counters:
-      mds:
-        - "mds.dir_split"
-- workunit:
-    clients:
-      all:
-        - kernel_untar_build.sh

diff --git a/qa/suites/fs/basic_workload/tasks/cfuse_workunit_misc.yaml b/qa/suites/fs/basic_workload/tasks/cfuse_workunit_misc.yaml
deleted file mode 100644 (file)
index d6c8140..0000000
--- a/qa/suites/fs/basic_workload/tasks/cfuse_workunit_misc.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-tasks:
-- check-counter:
-    counters:
-      mds:
-        - "mds.dir_split"
-- workunit:
-    clients:
-      all:
-        - fs/misc
-

diff --git a/qa/suites/fs/basic_workload/tasks/cfuse_workunit_misc_test_o_trunc.yaml b/qa/suites/fs/basic_workload/tasks/cfuse_workunit_misc_test_o_trunc.yaml
deleted file mode 100644 (file)
index c9de5c3..0000000
--- a/qa/suites/fs/basic_workload/tasks/cfuse_workunit_misc_test_o_trunc.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- workunit:
-    clients:
-      all:
-        - fs/test_o_trunc.sh

diff --git a/qa/suites/fs/basic_workload/tasks/cfuse_workunit_suites_blogbench.yaml b/qa/suites/fs/basic_workload/tasks/cfuse_workunit_suites_blogbench.yaml
deleted file mode 120000 (symlink)
index 8702f4f..0000000
--- a/qa/suites/fs/basic_workload/tasks/cfuse_workunit_suites_blogbench.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/tasks/cfuse_workunit_suites_blogbench.yaml
\ No newline at end of file

diff --git a/qa/suites/fs/basic_workload/tasks/cfuse_workunit_suites_dbench.yaml b/qa/suites/fs/basic_workload/tasks/cfuse_workunit_suites_dbench.yaml
deleted file mode 120000 (symlink)
index b0f876c..0000000
--- a/qa/suites/fs/basic_workload/tasks/cfuse_workunit_suites_dbench.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/tasks/cfuse_workunit_suites_dbench.yaml
\ No newline at end of file

diff --git a/qa/suites/fs/basic_workload/tasks/cfuse_workunit_suites_ffsb.yaml b/qa/suites/fs/basic_workload/tasks/cfuse_workunit_suites_ffsb.yaml
deleted file mode 120000 (symlink)
index 01e889b..0000000
--- a/qa/suites/fs/basic_workload/tasks/cfuse_workunit_suites_ffsb.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/tasks/cfuse_workunit_suites_ffsb.yaml
\ No newline at end of file

diff --git a/qa/suites/fs/basic_workload/tasks/cfuse_workunit_suites_fsstress.yaml b/qa/suites/fs/basic_workload/tasks/cfuse_workunit_suites_fsstress.yaml
deleted file mode 120000 (symlink)
index c2e859f..0000000
--- a/qa/suites/fs/basic_workload/tasks/cfuse_workunit_suites_fsstress.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/tasks/cfuse_workunit_suites_fsstress.yaml
\ No newline at end of file

diff --git a/qa/suites/fs/basic_workload/tasks/cfuse_workunit_suites_fsx.yaml b/qa/suites/fs/basic_workload/tasks/cfuse_workunit_suites_fsx.yaml
deleted file mode 100644 (file)
index b16cfb1..0000000
--- a/qa/suites/fs/basic_workload/tasks/cfuse_workunit_suites_fsx.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-tasks:
-- check-counter:
-    counters:
-      mds:
-        - "mds.dir_split"
-- workunit:
-    clients:
-      all:
-        - suites/fsx.sh

diff --git a/qa/suites/fs/basic_workload/tasks/cfuse_workunit_suites_fsync.yaml b/qa/suites/fs/basic_workload/tasks/cfuse_workunit_suites_fsync.yaml
deleted file mode 100644 (file)
index 7efa1ad..0000000
--- a/qa/suites/fs/basic_workload/tasks/cfuse_workunit_suites_fsync.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- workunit:
-    clients:
-      all:
-        - suites/fsync-tester.sh

diff --git a/qa/suites/fs/basic_workload/tasks/cfuse_workunit_suites_iogen.yaml b/qa/suites/fs/basic_workload/tasks/cfuse_workunit_suites_iogen.yaml
deleted file mode 100644 (file)
index 8d4c271..0000000
--- a/qa/suites/fs/basic_workload/tasks/cfuse_workunit_suites_iogen.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- workunit:
-    clients:
-      all:
-        - suites/iogen.sh
-

diff --git a/qa/suites/fs/basic_workload/tasks/cfuse_workunit_suites_iozone.yaml b/qa/suites/fs/basic_workload/tasks/cfuse_workunit_suites_iozone.yaml
deleted file mode 100644 (file)
index 9270f3c..0000000
--- a/qa/suites/fs/basic_workload/tasks/cfuse_workunit_suites_iozone.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- workunit:
-    clients:
-      all:
-        - suites/iozone.sh

diff --git a/qa/suites/fs/basic_workload/tasks/cfuse_workunit_suites_pjd.yaml b/qa/suites/fs/basic_workload/tasks/cfuse_workunit_suites_pjd.yaml
deleted file mode 100644 (file)
index 37e315f..0000000
--- a/qa/suites/fs/basic_workload/tasks/cfuse_workunit_suites_pjd.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-overrides:
-  ceph:
-    conf:
-      client:
-        fuse set user groups: true
-        fuse default permissions: false
-tasks:
-- workunit:
-    timeout: 6h
-    clients:
-      all:
-        - suites/pjd.sh

diff --git a/qa/suites/fs/basic_workload/tasks/cfuse_workunit_suites_truncate_delay.yaml b/qa/suites/fs/basic_workload/tasks/cfuse_workunit_suites_truncate_delay.yaml
deleted file mode 100644 (file)
index b47b565..0000000
--- a/qa/suites/fs/basic_workload/tasks/cfuse_workunit_suites_truncate_delay.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-overrides:
-  ceph:
-    conf:
-      client:
-        ms_inject_delay_probability: 1
-        ms_inject_delay_type: osd
-        ms_inject_delay_max: 5
-        client_oc_max_dirty_age: 1
-tasks:
-- exec:
-    client.0:
-      - cd $TESTDIR/mnt.* && dd if=/dev/zero of=./foo count=100
-      - sleep 2
-      - cd $TESTDIR/mnt.* && truncate --size 0 ./foo

diff --git a/qa/suites/fs/basic_workload/tasks/cfuse_workunit_trivial_sync.yaml b/qa/suites/fs/basic_workload/tasks/cfuse_workunit_trivial_sync.yaml
deleted file mode 120000 (symlink)
index a1df032..0000000
--- a/qa/suites/fs/basic_workload/tasks/cfuse_workunit_trivial_sync.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/tasks/cfuse_workunit_trivial_sync.yaml
\ No newline at end of file

diff --git a/qa/suites/fs/basic_workload/tasks/workunit/.qa b/qa/suites/fs/basic_workload/tasks/workunit/.qa
new file mode 120000 (symlink)
index 0000000..fea2489
--- /dev/null
+++ b/qa/suites/fs/basic_workload/tasks/workunit/.qa
@@ -0,0 +1 @@
+../.qa
\ No newline at end of file

diff --git a/qa/suites/fs/basic_workload/tasks/workunit/cfuse_workunit_suites_truncate_delay.yaml b/qa/suites/fs/basic_workload/tasks/workunit/cfuse_workunit_suites_truncate_delay.yaml
new file mode 100644 (file)
index 0000000..b47b565
--- /dev/null
+++ b/qa/suites/fs/basic_workload/tasks/workunit/cfuse_workunit_suites_truncate_delay.yaml
@@ -0,0 +1,14 @@
+overrides:
+  ceph:
+    conf:
+      client:
+        ms_inject_delay_probability: 1
+        ms_inject_delay_type: osd
+        ms_inject_delay_max: 5
+        client_oc_max_dirty_age: 1
+tasks:
+- exec:
+    client.0:
+      - cd $TESTDIR/mnt.* && dd if=/dev/zero of=./foo count=100
+      - sleep 2
+      - cd $TESTDIR/mnt.* && truncate --size 0 ./foo

diff --git a/qa/suites/fs/basic_workload/tasks/workunit/direct_io.yaml b/qa/suites/fs/basic_workload/tasks/workunit/direct_io.yaml
new file mode 100644 (file)
index 0000000..d0128bc
--- /dev/null
+++ b/qa/suites/fs/basic_workload/tasks/workunit/direct_io.yaml
@@ -0,0 +1,6 @@
+tasks:
+- workunit:
+    clients:
+      all:
+        - direct_io
+

diff --git a/qa/suites/fs/basic_workload/tasks/workunit/fs/misc.yaml b/qa/suites/fs/basic_workload/tasks/workunit/fs/misc.yaml
new file mode 100644 (file)
index 0000000..7c3f7bc
--- /dev/null
+++ b/qa/suites/fs/basic_workload/tasks/workunit/fs/misc.yaml
@@ -0,0 +1,9 @@
+tasks:
+- check-counter:
+    counters:
+      mds:
+        - "mds.dir_split"
+- workunit:
+    clients:
+      all:
+        - fs/misc

diff --git a/qa/suites/fs/basic_workload/tasks/workunit/fs/test_o_trunc.yaml b/qa/suites/fs/basic_workload/tasks/workunit/fs/test_o_trunc.yaml
new file mode 100644 (file)
index 0000000..c9de5c3
--- /dev/null
+++ b/qa/suites/fs/basic_workload/tasks/workunit/fs/test_o_trunc.yaml
@@ -0,0 +1,5 @@
+tasks:
+- workunit:
+    clients:
+      all:
+        - fs/test_o_trunc.sh

diff --git a/qa/suites/fs/basic_workload/tasks/workunit/kernel_untar_build.yaml b/qa/suites/fs/basic_workload/tasks/workunit/kernel_untar_build.yaml
new file mode 100644 (file)
index 0000000..65245fc
--- /dev/null
+++ b/qa/suites/fs/basic_workload/tasks/workunit/kernel_untar_build.yaml
@@ -0,0 +1,9 @@
+tasks:
+- check-counter:
+    counters:
+      mds:
+        - "mds.dir_split"
+- workunit:
+    clients:
+      all:
+        - kernel_untar_build.sh

diff --git a/qa/suites/fs/basic_workload/tasks/workunit/suites/.qa b/qa/suites/fs/basic_workload/tasks/workunit/suites/.qa
new file mode 120000 (symlink)
index 0000000..fea2489
--- /dev/null
+++ b/qa/suites/fs/basic_workload/tasks/workunit/suites/.qa
@@ -0,0 +1 @@
+../.qa
\ No newline at end of file

diff --git a/qa/suites/fs/basic_workload/tasks/workunit/suites/blogbench.yaml b/qa/suites/fs/basic_workload/tasks/workunit/suites/blogbench.yaml
new file mode 120000 (symlink)
index 0000000..8702f4f
--- /dev/null
+++ b/qa/suites/fs/basic_workload/tasks/workunit/suites/blogbench.yaml
@@ -0,0 +1 @@
+.qa/cephfs/tasks/cfuse_workunit_suites_blogbench.yaml
\ No newline at end of file

diff --git a/qa/suites/fs/basic_workload/tasks/workunit/suites/dbench.yaml b/qa/suites/fs/basic_workload/tasks/workunit/suites/dbench.yaml
new file mode 120000 (symlink)
index 0000000..b0f876c
--- /dev/null
+++ b/qa/suites/fs/basic_workload/tasks/workunit/suites/dbench.yaml
@@ -0,0 +1 @@
+.qa/cephfs/tasks/cfuse_workunit_suites_dbench.yaml
\ No newline at end of file

diff --git a/qa/suites/fs/basic_workload/tasks/workunit/suites/ffsb.yaml b/qa/suites/fs/basic_workload/tasks/workunit/suites/ffsb.yaml
new file mode 120000 (symlink)
index 0000000..01e889b
--- /dev/null
+++ b/qa/suites/fs/basic_workload/tasks/workunit/suites/ffsb.yaml
@@ -0,0 +1 @@
+.qa/cephfs/tasks/cfuse_workunit_suites_ffsb.yaml
\ No newline at end of file

diff --git a/qa/suites/fs/basic_workload/tasks/workunit/suites/fsstress.yaml b/qa/suites/fs/basic_workload/tasks/workunit/suites/fsstress.yaml
new file mode 120000 (symlink)
index 0000000..c2e859f
--- /dev/null
+++ b/qa/suites/fs/basic_workload/tasks/workunit/suites/fsstress.yaml
@@ -0,0 +1 @@
+.qa/cephfs/tasks/cfuse_workunit_suites_fsstress.yaml
\ No newline at end of file

diff --git a/qa/suites/fs/basic_workload/tasks/workunit/suites/fsx.yaml b/qa/suites/fs/basic_workload/tasks/workunit/suites/fsx.yaml
new file mode 100644 (file)
index 0000000..b16cfb1
--- /dev/null
+++ b/qa/suites/fs/basic_workload/tasks/workunit/suites/fsx.yaml
@@ -0,0 +1,9 @@
+tasks:
+- check-counter:
+    counters:
+      mds:
+        - "mds.dir_split"
+- workunit:
+    clients:
+      all:
+        - suites/fsx.sh

diff --git a/qa/suites/fs/basic_workload/tasks/workunit/suites/fsync-tester.yaml b/qa/suites/fs/basic_workload/tasks/workunit/suites/fsync-tester.yaml
new file mode 100644 (file)
index 0000000..7efa1ad
--- /dev/null
+++ b/qa/suites/fs/basic_workload/tasks/workunit/suites/fsync-tester.yaml
@@ -0,0 +1,5 @@
+tasks:
+- workunit:
+    clients:
+      all:
+        - suites/fsync-tester.sh

diff --git a/qa/suites/fs/basic_workload/tasks/workunit/suites/iogen.yaml b/qa/suites/fs/basic_workload/tasks/workunit/suites/iogen.yaml
new file mode 100644 (file)
index 0000000..d45d4ea
--- /dev/null
+++ b/qa/suites/fs/basic_workload/tasks/workunit/suites/iogen.yaml
@@ -0,0 +1,5 @@
+tasks:
+- workunit:
+    clients:
+      all:
+        - suites/iogen.sh

diff --git a/qa/suites/fs/basic_workload/tasks/workunit/suites/iozone.yaml b/qa/suites/fs/basic_workload/tasks/workunit/suites/iozone.yaml
new file mode 100644 (file)
index 0000000..9270f3c
--- /dev/null
+++ b/qa/suites/fs/basic_workload/tasks/workunit/suites/iozone.yaml
@@ -0,0 +1,5 @@
+tasks:
+- workunit:
+    clients:
+      all:
+        - suites/iozone.sh

diff --git a/qa/suites/fs/basic_workload/tasks/workunit/suites/pjd.yaml b/qa/suites/fs/basic_workload/tasks/workunit/suites/pjd.yaml
new file mode 100644 (file)
index 0000000..37e315f
--- /dev/null
+++ b/qa/suites/fs/basic_workload/tasks/workunit/suites/pjd.yaml
@@ -0,0 +1,12 @@
+overrides:
+  ceph:
+    conf:
+      client:
+        fuse set user groups: true
+        fuse default permissions: false
+tasks:
+- workunit:
+    timeout: 6h
+    clients:
+      all:
+        - suites/pjd.sh

diff --git a/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_direct_io.yaml b/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_direct_io.yaml
deleted file mode 100644 (file)
index d0128bc..0000000
--- a/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_direct_io.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- workunit:
-    clients:
-      all:
-        - direct_io
-

diff --git a/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_kernel_untar_build.yaml b/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_kernel_untar_build.yaml
deleted file mode 100644 (file)
index 5c9acc1..0000000
--- a/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_kernel_untar_build.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- workunit:
-    clients:
-      all:
-        - kernel_untar_build.sh

diff --git a/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_misc.yaml b/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_misc.yaml
deleted file mode 100644 (file)
index aa62b9e..0000000
--- a/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_misc.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- workunit:
-    clients:
-      all:
-        - fs/misc

diff --git a/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_o_trunc.yaml b/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_o_trunc.yaml
deleted file mode 100644 (file)
index 91c953b..0000000
--- a/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_o_trunc.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- workunit:
-    clients:
-      all:
-        - fs/test_o_trunc.sh
-

diff --git a/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_suites_dbench.yaml b/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_suites_dbench.yaml
deleted file mode 100644 (file)
index 41b2bc8..0000000
--- a/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_suites_dbench.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- workunit:
-    clients:
-      all:
-        - suites/dbench.sh

diff --git a/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_suites_ffsb.yaml b/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_suites_ffsb.yaml
deleted file mode 100644 (file)
index bff1306..0000000
--- a/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_suites_ffsb.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-overrides:
-  ceph:
-    log-ignorelist:
-    - SLOW_OPS
-    - slow request
-tasks:
-- workunit:
-    clients:
-      all:
-        - suites/ffsb.sh

diff --git a/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_suites_fsstress.yaml b/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_suites_fsstress.yaml
deleted file mode 100644 (file)
index ddb18fb..0000000
--- a/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_suites_fsstress.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- workunit:
-    clients:
-      all:
-        - suites/fsstress.sh

diff --git a/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_suites_fsx.yaml b/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_suites_fsx.yaml
deleted file mode 100644 (file)
index 8b2b1ab..0000000
--- a/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_suites_fsx.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- workunit:
-    clients:
-      all:
-        - suites/fsx.sh

diff --git a/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_suites_fsync.yaml b/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_suites_fsync.yaml
deleted file mode 100644 (file)
index 7efa1ad..0000000
--- a/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_suites_fsync.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- workunit:
-    clients:
-      all:
-        - suites/fsync-tester.sh

diff --git a/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_suites_iozone.yaml b/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_suites_iozone.yaml
deleted file mode 100644 (file)
index 9270f3c..0000000
--- a/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_suites_iozone.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- workunit:
-    clients:
-      all:
-        - suites/iozone.sh

diff --git a/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_suites_pjd.yaml b/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_suites_pjd.yaml
deleted file mode 100644 (file)
index 1de182c..0000000
--- a/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_suites_pjd.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- workunit:
-    timeout: 6h
-    clients:
-      all:
-        - suites/pjd.sh

diff --git a/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_trivial_sync.yaml b/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_trivial_sync.yaml
deleted file mode 100644 (file)
index 36e7411..0000000
--- a/qa/suites/kcephfs/cephfs/tasks/kclient_workunit_trivial_sync.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-tasks:
-- workunit:
-    clients:
-      all: [fs/misc/trivial_sync.sh]