suites/fs: unify/reuse common (fuse) mount

Goal is to reduce arbitrary differences between fs suites.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>

diff --git a/cephfs/mount/fuse.yaml b/cephfs/mount/fuse.yaml
new file mode 100644 (file)
index 0000000..8338cc4
--- /dev/null
+++ b/cephfs/mount/fuse.yaml
@@ -0,0 +1,2 @@
+tasks:
+  - ceph-fuse:

diff --git a/suites/fs/32bits/mount/ceph-fuse.yaml b/suites/fs/32bits/mount/ceph-fuse.yaml
deleted file mode 100644 (file)
index 3b9d833..0000000
--- a/suites/fs/32bits/mount/ceph-fuse.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-overrides:
-  ceph:
-    conf:
-      client:
-        client use faked inos: true
-tasks:
-- ceph-fuse:

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

diff --git a/suites/fs/32bits/overrides/faked-ino.yaml b/suites/fs/32bits/overrides/faked-ino.yaml
new file mode 100644 (file)
index 0000000..102df68
--- /dev/null
+++ b/suites/fs/32bits/overrides/faked-ino.yaml
@@ -0,0 +1,5 @@
+overrides:
+  ceph:
+    conf:
+      client:
+        client use faked inos: true

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

diff --git a/suites/fs/basic/tasks/asok_dump_tree.yaml b/suites/fs/basic/tasks/asok_dump_tree.yaml
index bb21a771e439a3bdb69e4f87ec2992b868eddc08..7fa561470b61b86770c86f8fa8a3e8c9b523af43 100644 (file)
--- a/suites/fs/basic/tasks/asok_dump_tree.yaml
+++ b/suites/fs/basic/tasks/asok_dump_tree.yaml
@@ -1,5 +1,4 @@
 tasks:
-- ceph-fuse:
 - cephfs_test_runner:
     modules:
       - tasks.cephfs.test_dump_tree

diff --git a/suites/fs/basic/tasks/cephfs_scrub_tests.yaml b/suites/fs/basic/tasks/cephfs_scrub_tests.yaml
index 693687d9533bf6b4b46c6054cc98d6b7531eda1f..f0c2891ae7f75e9e649d74d52c56f41dfae3afe4 100644 (file)
--- a/suites/fs/basic/tasks/cephfs_scrub_tests.yaml
+++ b/suites/fs/basic/tasks/cephfs_scrub_tests.yaml
@@ -7,7 +7,6 @@ overrides:
         mds log max segments: 1
         mds cache max size: 1000
 tasks:
-- ceph-fuse:
 - cephfs_test_runner:
     modules:
       - tasks.cephfs.test_scrub_checks

diff --git a/suites/fs/basic/tasks/cfuse_workunit_kernel_untar_build.yaml b/suites/fs/basic/tasks/cfuse_workunit_kernel_untar_build.yaml
index fcc52912963a44db2636095a21d561b43b820eb1..8dbc24a9febf176f11df96ecf8e6b9b1ab8c44de 100644 (file)
--- a/suites/fs/basic/tasks/cfuse_workunit_kernel_untar_build.yaml
+++ b/suites/fs/basic/tasks/cfuse_workunit_kernel_untar_build.yaml
@@ -4,7 +4,6 @@ overrides:
       client:
         fuse_default_permissions: 0
 tasks:
-- ceph-fuse:
 - workunit:
     clients:
       all:

diff --git a/suites/fs/basic/tasks/cfuse_workunit_misc.yaml b/suites/fs/basic/tasks/cfuse_workunit_misc.yaml
index 6dfec976eecc26dc036f4178c617658c8a1eaa24..5d54f3da0b40989827046a0089af6c08da191944 100644 (file)
--- a/suites/fs/basic/tasks/cfuse_workunit_misc.yaml
+++ b/suites/fs/basic/tasks/cfuse_workunit_misc.yaml
@@ -1,5 +1,4 @@
 tasks:
-- ceph-fuse:
 - workunit:
     timeout: 6h
     clients:

diff --git a/suites/fs/basic/tasks/cfuse_workunit_misc_test_o_trunc.yaml b/suites/fs/basic/tasks/cfuse_workunit_misc_test_o_trunc.yaml
index c9720a2fd488f9257ed811648333ef108ecabb8b..c9de5c386377fc5acdf7df8fa81d923f8513b71d 100644 (file)
--- a/suites/fs/basic/tasks/cfuse_workunit_misc_test_o_trunc.yaml
+++ b/suites/fs/basic/tasks/cfuse_workunit_misc_test_o_trunc.yaml
@@ -1,5 +1,4 @@
 tasks:
-- ceph-fuse:
 - workunit:
     clients:
       all:

diff --git a/suites/fs/basic/tasks/cfuse_workunit_norstats.yaml b/suites/fs/basic/tasks/cfuse_workunit_norstats.yaml
index 6174fad29d67f5344e9ac55bdd648ca3327a6466..4833371df1bcec0fa96b352d4993440d5282855c 100644 (file)
--- a/suites/fs/basic/tasks/cfuse_workunit_norstats.yaml
+++ b/suites/fs/basic/tasks/cfuse_workunit_norstats.yaml
@@ -1,5 +1,4 @@
 tasks:
-- ceph-fuse:
 - workunit:
     timeout: 6h
     clients:

diff --git a/suites/fs/basic/tasks/cfuse_workunit_quota.yaml b/suites/fs/basic/tasks/cfuse_workunit_quota.yaml
index a6d35ab8ecec64648ddfab4eef627d674f442354..7908bc88c4b2d5d163eec80f3d708ab6c89ca269 100644 (file)
--- a/suites/fs/basic/tasks/cfuse_workunit_quota.yaml
+++ b/suites/fs/basic/tasks/cfuse_workunit_quota.yaml
@@ -1,5 +1,4 @@
 tasks:
-- ceph-fuse:
 - workunit:
     timeout: 6h
     clients:

diff --git a/suites/fs/basic/tasks/cfuse_workunit_suites_blogbench.yaml b/suites/fs/basic/tasks/cfuse_workunit_suites_blogbench.yaml
index 09898e16bda4e9055b4f8c9f65356f8f00c7213a..4c1fcc11ed906ed887c25a16080d7f3279a4268a 100644 (file)
--- a/suites/fs/basic/tasks/cfuse_workunit_suites_blogbench.yaml
+++ b/suites/fs/basic/tasks/cfuse_workunit_suites_blogbench.yaml
@@ -1,5 +1,4 @@
 tasks:
-- ceph-fuse:
 - workunit:
     clients:
       all:

diff --git a/suites/fs/basic/tasks/cfuse_workunit_suites_dbench.yaml b/suites/fs/basic/tasks/cfuse_workunit_suites_dbench.yaml
index ad96b4c5e7fcfe50492affcd7ca05f528dda3721..41b2bc8edaab2004345e56ae8e43057726720ad6 100644 (file)
--- a/suites/fs/basic/tasks/cfuse_workunit_suites_dbench.yaml
+++ b/suites/fs/basic/tasks/cfuse_workunit_suites_dbench.yaml
@@ -1,5 +1,4 @@
 tasks:
-- ceph-fuse:
 - workunit:
     clients:
       all:

diff --git a/suites/fs/basic/tasks/cfuse_workunit_suites_ffsb.yaml b/suites/fs/basic/tasks/cfuse_workunit_suites_ffsb.yaml
index 8600816003499db7d8b3bdfb2cc5ef2c7d66168a..4a2a627fe5d327bfc03df40ec4d3564c65bf8938 100644 (file)
--- a/suites/fs/basic/tasks/cfuse_workunit_suites_ffsb.yaml
+++ b/suites/fs/basic/tasks/cfuse_workunit_suites_ffsb.yaml
@@ -4,7 +4,6 @@ overrides:
       osd:
         filestore flush min: 0
 tasks:
-- ceph-fuse:
 - workunit:
     clients:
       all:

diff --git a/suites/fs/basic/tasks/cfuse_workunit_suites_fsstress.yaml b/suites/fs/basic/tasks/cfuse_workunit_suites_fsstress.yaml
index 5908d951b2df0add0792c67e8db89d9e9abc15a0..ddb18fb791aa2a2ba13aabcfe1d79fa158eaf518 100644 (file)
--- a/suites/fs/basic/tasks/cfuse_workunit_suites_fsstress.yaml
+++ b/suites/fs/basic/tasks/cfuse_workunit_suites_fsstress.yaml
@@ -1,5 +1,4 @@
 tasks:
-- ceph-fuse:
 - workunit:
     clients:
       all:

diff --git a/suites/fs/basic/tasks/cfuse_workunit_suites_fsx.yaml b/suites/fs/basic/tasks/cfuse_workunit_suites_fsx.yaml
index 3c11ed74fc72819fa902a495f874574d3142c0c4..8b2b1ab5c141432bab1916e8346c74eb72e27791 100644 (file)
--- a/suites/fs/basic/tasks/cfuse_workunit_suites_fsx.yaml
+++ b/suites/fs/basic/tasks/cfuse_workunit_suites_fsx.yaml
@@ -1,5 +1,4 @@
 tasks:
-- ceph-fuse:
 - workunit:
     clients:
       all:

diff --git a/suites/fs/basic/tasks/cfuse_workunit_suites_fsync.yaml b/suites/fs/basic/tasks/cfuse_workunit_suites_fsync.yaml
index c6043e209bd453e693e6d3a967a8e6f9a210a22c..7efa1adb82da86cd884246cb5f635ff7a866bff3 100644 (file)
--- a/suites/fs/basic/tasks/cfuse_workunit_suites_fsync.yaml
+++ b/suites/fs/basic/tasks/cfuse_workunit_suites_fsync.yaml
@@ -1,5 +1,4 @@
 tasks:
-- ceph-fuse:
 - workunit:
     clients:
       all:

diff --git a/suites/fs/basic/tasks/cfuse_workunit_suites_iogen.yaml b/suites/fs/basic/tasks/cfuse_workunit_suites_iogen.yaml
index 6989990e22aa713894d717dd8e60ee8a8a1495a0..8d4c27108b28114d904e782d69e3182a1cfa2a79 100644 (file)
--- a/suites/fs/basic/tasks/cfuse_workunit_suites_iogen.yaml
+++ b/suites/fs/basic/tasks/cfuse_workunit_suites_iogen.yaml
@@ -1,5 +1,4 @@
 tasks:
-- ceph-fuse:
 - workunit:
     clients:
       all:

diff --git a/suites/fs/basic/tasks/cfuse_workunit_suites_iozone.yaml b/suites/fs/basic/tasks/cfuse_workunit_suites_iozone.yaml
index 1e23f670e28944a22acf165349acc5624df5d6b3..9270f3c51e22b18a8870ed5962cfc1464f09ca0c 100644 (file)
--- a/suites/fs/basic/tasks/cfuse_workunit_suites_iozone.yaml
+++ b/suites/fs/basic/tasks/cfuse_workunit_suites_iozone.yaml
@@ -1,5 +1,4 @@
 tasks:
-- ceph-fuse: [client.0]
 - workunit:
     clients:
       all:

diff --git a/suites/fs/basic/tasks/cfuse_workunit_suites_pjd.yaml b/suites/fs/basic/tasks/cfuse_workunit_suites_pjd.yaml
index 85bb18d7fa7bdc1e3ee6512612e71ab5bd8e04b4..7cb0b0f6e6bf27a1a1f10a01a8734a5d147b5a82 100644 (file)
--- a/suites/fs/basic/tasks/cfuse_workunit_suites_pjd.yaml
+++ b/suites/fs/basic/tasks/cfuse_workunit_suites_pjd.yaml
@@ -10,7 +10,6 @@ overrides:
         debug ms: 1
         debug mds: 20
 tasks:
-- ceph-fuse:
 - workunit:
     clients:
       all:

diff --git a/suites/fs/basic/tasks/cfuse_workunit_suites_truncate_delay.yaml b/suites/fs/basic/tasks/cfuse_workunit_suites_truncate_delay.yaml
index 911026e13bbc2e483371692db9e2608190cb2263..b47b565691460032426d6ddbc6df9d5c2fe135e7 100644 (file)
--- a/suites/fs/basic/tasks/cfuse_workunit_suites_truncate_delay.yaml
+++ b/suites/fs/basic/tasks/cfuse_workunit_suites_truncate_delay.yaml
@@ -7,7 +7,6 @@ overrides:
         ms_inject_delay_max: 5
         client_oc_max_dirty_age: 1
 tasks:
-- ceph-fuse:
 - exec:
     client.0:
       - cd $TESTDIR/mnt.* && dd if=/dev/zero of=./foo count=100

diff --git a/suites/fs/basic/tasks/cfuse_workunit_trivial_sync.yaml b/suites/fs/basic/tasks/cfuse_workunit_trivial_sync.yaml
index 9509650c76c03fc5c4992149606ea847a42f6049..36e7411b6385a6ddb05054513a542e546dbcd8d2 100644 (file)
--- a/suites/fs/basic/tasks/cfuse_workunit_trivial_sync.yaml
+++ b/suites/fs/basic/tasks/cfuse_workunit_trivial_sync.yaml
@@ -1,5 +1,4 @@
 tasks:
-- ceph-fuse:
 - workunit:
     clients:
       all: [fs/misc/trivial_sync.sh]

diff --git a/suites/fs/basic/tasks/libcephfs_interface_tests.yaml b/suites/fs/basic/tasks/libcephfs_interface_tests.yaml
index 0b1d41fea5c444e51203829976e0ce8f163b4d27..d9a2f9cdc6d36fac42733512de7cbfbb1a56343a 100644 (file)
--- a/suites/fs/basic/tasks/libcephfs_interface_tests.yaml
+++ b/suites/fs/basic/tasks/libcephfs_interface_tests.yaml
@@ -1,5 +1,7 @@
+overrides:
+  ceph-fuse:
+    disabled: true
 tasks:
-- ceph-fuse:
 - workunit:
     clients:
       client.0:

diff --git a/suites/fs/basic/tasks/libcephfs_java.yaml b/suites/fs/basic/tasks/libcephfs_java.yaml
index 1e8c32f2202cde48b2b391361f5bc288c2a79bcb..f2eb00bf1187bccfae83509662531e420623b0e1 100644 (file)
--- a/suites/fs/basic/tasks/libcephfs_java.yaml
+++ b/suites/fs/basic/tasks/libcephfs_java.yaml
@@ -2,8 +2,10 @@
 os_type: ubuntu
 os_version: "14.04"
 
+overrides:
+  ceph-fuse:
+    disabled: true
 tasks:
-- ceph-fuse:
 - workunit:
     clients:
       client.0:

diff --git a/suites/fs/basic/tasks/libcephfs_python.yaml b/suites/fs/basic/tasks/libcephfs_python.yaml
index 6f773299a87eb265cb65ea5589e58b73e7063b62..ffbbff81b4b16257a4904a67fab34c5a25853df0 100644 (file)
--- a/suites/fs/basic/tasks/libcephfs_python.yaml
+++ b/suites/fs/basic/tasks/libcephfs_python.yaml
@@ -1,3 +1,6 @@
+overrides:
+  ceph-fuse:
+    disabled: true
 tasks:
 - workunit:
     clients:

diff --git a/suites/fs/basic/tasks/mds_creation_retry.yaml b/suites/fs/basic/tasks/mds_creation_retry.yaml
index 76ceeafa8e772c5dca690723babe90e690496c05..fd23aa8bad0c315e97afd854e9e45c9fb9264cbc 100644 (file)
--- a/suites/fs/basic/tasks/mds_creation_retry.yaml
+++ b/suites/fs/basic/tasks/mds_creation_retry.yaml
@@ -1,6 +1,5 @@
 tasks:
 -mds_creation_failure:
--ceph-fuse:
 - workunit:
     clients:
       all: [fs/misc/trivial_sync.sh]

diff --git a/suites/fs/multiclient/mount/ceph-fuse.yaml b/suites/fs/multiclient/mount/ceph-fuse.yaml
deleted file mode 100644 (file)
index e3c34a1..0000000
--- a/suites/fs/multiclient/mount/ceph-fuse.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-tasks:
-- ceph-fuse:

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

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

diff --git a/suites/fs/multifs/mounts/ceph-fuse.yaml b/suites/fs/multifs/mounts/ceph-fuse.yaml
deleted file mode 100644 (file)
index b9d4788..0000000
--- a/suites/fs/multifs/mounts/ceph-fuse.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-tasks:
-- ceph-fuse:
-    client.0:
-        mounted: false
-    client.1:
-        mounted: false

diff --git a/suites/fs/multifs/tasks/failover.yaml b/suites/fs/multifs/tasks/failover.yaml
index 8f3d5e1a9bf9cd4cded0ea0e86b72fafdb1c63ed..d837d4b2687c3e3cc8fdb1ae00c5403f272317b5 100644 (file)
--- a/suites/fs/multifs/tasks/failover.yaml
+++ b/suites/fs/multifs/tasks/failover.yaml
@@ -1,4 +1,6 @@
-
+overrides:
+  ceph-fuse:
+    disabled: true
 tasks:
   - cephfs_test_runner:
       modules:

diff --git a/suites/fs/permission/mount/ceph-fuse.yaml b/suites/fs/permission/mount/ceph-fuse.yaml
deleted file mode 100644 (file)
index 6015e37..0000000
--- a/suites/fs/permission/mount/ceph-fuse.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-overrides:
-  ceph:
-    conf:
-      client:
-        fuse default permissions: false
-        client acl type: posix_acl
-tasks:
-- ceph-fuse:

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

diff --git a/suites/fs/permission/tasks/cfuse_workunit_misc.yaml b/suites/fs/permission/tasks/cfuse_workunit_misc.yaml
index 5f3d560a9f89f6ad708a336d1a191713a315e9e2..618498e6cdc5d1498b8e80e659105f6d6a159301 100644 (file)
--- a/suites/fs/permission/tasks/cfuse_workunit_misc.yaml
+++ b/suites/fs/permission/tasks/cfuse_workunit_misc.yaml
@@ -1,3 +1,9 @@
+overrides:
+  ceph:
+    conf:
+      client:
+        fuse default permissions: false
+        client acl type: posix_acl
 tasks:
 - workunit:
     clients:

diff --git a/suites/fs/permission/tasks/cfuse_workunit_suites_pjd.yaml b/suites/fs/permission/tasks/cfuse_workunit_suites_pjd.yaml
index a1e2ada19e995b5916b8f63edf31a05ba55862c5..2dd8ac77955ad52d83add8b1607aab2aa1816f13 100644 (file)
--- a/suites/fs/permission/tasks/cfuse_workunit_suites_pjd.yaml
+++ b/suites/fs/permission/tasks/cfuse_workunit_suites_pjd.yaml
@@ -4,6 +4,7 @@ overrides:
       client:
         fuse set user groups: true
         fuse default permissions: false
+        client acl type: posix_acl
 tasks:
 - workunit:
     clients:

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

diff --git a/suites/fs/recovery/mounts/ceph-fuse.yaml b/suites/fs/recovery/mounts/ceph-fuse.yaml
deleted file mode 100644 (file)
index b38965d..0000000
--- a/suites/fs/recovery/mounts/ceph-fuse.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-tasks:
-- ceph-fuse:
-    client.0:
-        mounted: false
-    client.1:
-        mounted: false
-    client.2:
-        mounted: false
-    client.3:
-        mounted: false

diff --git a/suites/fs/recovery/overrides/fuse-unmounted.yaml b/suites/fs/recovery/overrides/fuse-unmounted.yaml
new file mode 100644 (file)
index 0000000..02c8cf4
--- /dev/null
+++ b/suites/fs/recovery/overrides/fuse-unmounted.yaml
@@ -0,0 +1,3 @@
+overrides:
+  ceph-fuse:
+    disabled: true

diff --git a/suites/fs/snaps/mount/ceph-fuse.yaml b/suites/fs/snaps/mount/ceph-fuse.yaml
deleted file mode 100644 (file)
index e3c34a1..0000000
--- a/suites/fs/snaps/mount/ceph-fuse.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-tasks:
-- ceph-fuse:

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

diff --git a/suites/fs/standbyreplay/mount/fuse.yaml b/suites/fs/standbyreplay/mount/fuse.yaml
deleted file mode 100644 (file)
index dd489e7b6d1e07e0137cfed5f7e201403b035038..0000000000000000000000000000000000000000
--- a/suites/fs/standbyreplay/mount/fuse.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-tasks:
-  - ceph_fuse:

diff --git a/suites/fs/standbyreplay/mount/fuse.yaml b/suites/fs/standbyreplay/mount/fuse.yaml
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..af9ee0ab7986f59a58d2818aecd87c8e53e3d907
--- /dev/null
+++ b/suites/fs/standbyreplay/mount/fuse.yaml
@@ -0,0 +1 @@
+../../../../cephfs/mount/fuse.yaml
\ No newline at end of file

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

diff --git a/suites/fs/thrash/tasks/cfuse_workunit_snaptests.yaml b/suites/fs/thrash/tasks/cfuse_workunit_snaptests.yaml
index 7efe47da3d0a5be0237a24706684d0eae112ed7c..790c93c2b170ef88dff9b7008747ea34681d40c7 100644 (file)
--- a/suites/fs/thrash/tasks/cfuse_workunit_snaptests.yaml
+++ b/suites/fs/thrash/tasks/cfuse_workunit_snaptests.yaml
@@ -1,5 +1,4 @@
 tasks:
-- ceph-fuse:
 - workunit:
     clients:
       all:

diff --git a/suites/fs/thrash/tasks/cfuse_workunit_suites_fsstress.yaml b/suites/fs/thrash/tasks/cfuse_workunit_suites_fsstress.yaml
index 5908d951b2df0add0792c67e8db89d9e9abc15a0..ddb18fb791aa2a2ba13aabcfe1d79fa158eaf518 100644 (file)
--- a/suites/fs/thrash/tasks/cfuse_workunit_suites_fsstress.yaml
+++ b/suites/fs/thrash/tasks/cfuse_workunit_suites_fsstress.yaml
@@ -1,5 +1,4 @@
 tasks:
-- ceph-fuse:
 - workunit:
     clients:
       all:

diff --git a/suites/fs/thrash/tasks/cfuse_workunit_suites_pjd.yaml b/suites/fs/thrash/tasks/cfuse_workunit_suites_pjd.yaml
index 4e45dcac0ac33c23a3ebd936c9f5e386c2e6b8c9..a1e2ada19e995b5916b8f63edf31a05ba55862c5 100644 (file)
--- a/suites/fs/thrash/tasks/cfuse_workunit_suites_pjd.yaml
+++ b/suites/fs/thrash/tasks/cfuse_workunit_suites_pjd.yaml
@@ -5,7 +5,6 @@ overrides:
         fuse set user groups: true
         fuse default permissions: false
 tasks:
-- ceph-fuse:
 - workunit:
     clients:
       all:

diff --git a/suites/fs/thrash/tasks/cfuse_workunit_trivial_sync.yaml b/suites/fs/thrash/tasks/cfuse_workunit_trivial_sync.yaml
index 9509650c76c03fc5c4992149606ea847a42f6049..36e7411b6385a6ddb05054513a542e546dbcd8d2 100644 (file)
--- a/suites/fs/thrash/tasks/cfuse_workunit_trivial_sync.yaml
+++ b/suites/fs/thrash/tasks/cfuse_workunit_trivial_sync.yaml
@@ -1,5 +1,4 @@
 tasks:
-- ceph-fuse:
 - workunit:
     clients:
       all: [fs/misc/trivial_sync.sh]

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

diff --git a/suites/fs/traceless/tasks/cfuse_workunit_suites_blogbench.yaml b/suites/fs/traceless/tasks/cfuse_workunit_suites_blogbench.yaml
index 09898e16bda4e9055b4f8c9f65356f8f00c7213a..4c1fcc11ed906ed887c25a16080d7f3279a4268a 100644 (file)
--- a/suites/fs/traceless/tasks/cfuse_workunit_suites_blogbench.yaml
+++ b/suites/fs/traceless/tasks/cfuse_workunit_suites_blogbench.yaml
@@ -1,5 +1,4 @@
 tasks:
-- ceph-fuse:
 - workunit:
     clients:
       all:

diff --git a/suites/fs/traceless/tasks/cfuse_workunit_suites_dbench.yaml b/suites/fs/traceless/tasks/cfuse_workunit_suites_dbench.yaml
index ad96b4c5e7fcfe50492affcd7ca05f528dda3721..41b2bc8edaab2004345e56ae8e43057726720ad6 100644 (file)
--- a/suites/fs/traceless/tasks/cfuse_workunit_suites_dbench.yaml
+++ b/suites/fs/traceless/tasks/cfuse_workunit_suites_dbench.yaml
@@ -1,5 +1,4 @@
 tasks:
-- ceph-fuse:
 - workunit:
     clients:
       all:

diff --git a/suites/fs/traceless/tasks/cfuse_workunit_suites_ffsb.yaml b/suites/fs/traceless/tasks/cfuse_workunit_suites_ffsb.yaml
index 8600816003499db7d8b3bdfb2cc5ef2c7d66168a..4a2a627fe5d327bfc03df40ec4d3564c65bf8938 100644 (file)
--- a/suites/fs/traceless/tasks/cfuse_workunit_suites_ffsb.yaml
+++ b/suites/fs/traceless/tasks/cfuse_workunit_suites_ffsb.yaml
@@ -4,7 +4,6 @@ overrides:
       osd:
         filestore flush min: 0
 tasks:
-- ceph-fuse:
 - workunit:
     clients:
       all:

diff --git a/suites/fs/traceless/tasks/cfuse_workunit_suites_fsstress.yaml b/suites/fs/traceless/tasks/cfuse_workunit_suites_fsstress.yaml
index 5908d951b2df0add0792c67e8db89d9e9abc15a0..ddb18fb791aa2a2ba13aabcfe1d79fa158eaf518 100644 (file)
--- a/suites/fs/traceless/tasks/cfuse_workunit_suites_fsstress.yaml
+++ b/suites/fs/traceless/tasks/cfuse_workunit_suites_fsstress.yaml
@@ -1,5 +1,4 @@
 tasks:
-- ceph-fuse:
 - workunit:
     clients:
       all:

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

diff --git a/suites/fs/verify/tasks/cfuse_workunit_suites_dbench.yaml b/suites/fs/verify/tasks/cfuse_workunit_suites_dbench.yaml
index ad96b4c5e7fcfe50492affcd7ca05f528dda3721..41b2bc8edaab2004345e56ae8e43057726720ad6 100644 (file)
--- a/suites/fs/verify/tasks/cfuse_workunit_suites_dbench.yaml
+++ b/suites/fs/verify/tasks/cfuse_workunit_suites_dbench.yaml
@@ -1,5 +1,4 @@
 tasks:
-- ceph-fuse:
 - workunit:
     clients:
       all:

diff --git a/suites/fs/verify/tasks/cfuse_workunit_suites_fsstress.yaml b/suites/fs/verify/tasks/cfuse_workunit_suites_fsstress.yaml
index 5908d951b2df0add0792c67e8db89d9e9abc15a0..ddb18fb791aa2a2ba13aabcfe1d79fa158eaf518 100644 (file)
--- a/suites/fs/verify/tasks/cfuse_workunit_suites_fsstress.yaml
+++ b/suites/fs/verify/tasks/cfuse_workunit_suites_fsstress.yaml
@@ -1,5 +1,4 @@
 tasks:
-- ceph-fuse:
 - workunit:
     clients:
       all:

diff --git a/suites/fs/verify/tasks/libcephfs_interface_tests.yaml b/suites/fs/verify/tasks/libcephfs_interface_tests.yaml
index 0b1d41fea5c444e51203829976e0ce8f163b4d27..04ab2a4bcfc3296c8d6b4f9c49a52a463dcd7f44 100644 (file)
--- a/suites/fs/verify/tasks/libcephfs_interface_tests.yaml
+++ b/suites/fs/verify/tasks/libcephfs_interface_tests.yaml
@@ -1,5 +1,4 @@
 tasks:
-- ceph-fuse:
 - workunit:
     clients:
       client.0:

diff --git a/suites/multimds/libcephfs/tasks/libcephfs_interface_tests.yaml b/suites/multimds/libcephfs/tasks/libcephfs_interface_tests.yaml
index 0b1d41fea5c444e51203829976e0ce8f163b4d27..8c6659f93df5669ecdb64673bfe0ea1ec5f67495 100644 (file)
--- a/suites/multimds/libcephfs/tasks/libcephfs_interface_tests.yaml
+++ b/suites/multimds/libcephfs/tasks/libcephfs_interface_tests.yaml
@@ -1,3 +1,6 @@
+overrides:
+  ceph-fuse:
+    disabled: true
 tasks:
 - ceph-fuse:
 - workunit:

diff --git a/suites/multimds/libcephfs/tasks/libcephfs_java.yaml b/suites/multimds/libcephfs/tasks/libcephfs_java.yaml
index 4330d50965e5c5c2251ce3de4dfc33fb7d37f48d..4bb7acefe80f939c41cc98797d6da8ffbaf8b847 100644 (file)
--- a/suites/multimds/libcephfs/tasks/libcephfs_java.yaml
+++ b/suites/multimds/libcephfs/tasks/libcephfs_java.yaml
@@ -1,3 +1,6 @@
+overrides:
+  ceph-fuse:
+    disabled: true
 tasks:
 - ceph-fuse:
 - workunit: