suites/fs: link to common tasks

Goal is to reduce arbitrary differences between fs suites.

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

diff --git a/cephfs/tasks/cfuse_workunit_suites_blogbench.yaml b/cephfs/tasks/cfuse_workunit_suites_blogbench.yaml
new file mode 100644 (file)
index 0000000..4c1fcc1
--- /dev/null
+++ b/cephfs/tasks/cfuse_workunit_suites_blogbench.yaml
@@ -0,0 +1,5 @@
+tasks:
+- workunit:
+    clients:
+      all:
+        - suites/blogbench.sh

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

diff --git a/cephfs/tasks/cfuse_workunit_suites_ffsb.yaml b/cephfs/tasks/cfuse_workunit_suites_ffsb.yaml
new file mode 100644 (file)
index 0000000..4a2a627
--- /dev/null
+++ b/cephfs/tasks/cfuse_workunit_suites_ffsb.yaml
@@ -0,0 +1,10 @@
+overrides:
+  ceph:
+    conf:
+      osd:
+        filestore flush min: 0
+tasks:
+- workunit:
+    clients:
+      all:
+        - suites/ffsb.sh

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

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

diff --git a/cephfs/tasks/libcephfs_interface_tests.yaml b/cephfs/tasks/libcephfs_interface_tests.yaml
new file mode 100644 (file)
index 0000000..d9a2f9c
--- /dev/null
+++ b/cephfs/tasks/libcephfs_interface_tests.yaml
@@ -0,0 +1,8 @@
+overrides:
+  ceph-fuse:
+    disabled: true
+tasks:
+- workunit:
+    clients:
+      client.0:
+        - libcephfs/test.sh

diff --git a/suites/fs/32bits/tasks/cfuse_workunit_suites_fsstress.yaml b/suites/fs/32bits/tasks/cfuse_workunit_suites_fsstress.yaml
deleted file mode 100644 (file)
index ddb18fb791aa2a2ba13aabcfe1d79fa158eaf518..0000000000000000000000000000000000000000
--- a/suites/fs/32bits/tasks/cfuse_workunit_suites_fsstress.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- workunit:
-    clients:
-      all:
-        - suites/fsstress.sh

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

diff --git a/suites/fs/basic/tasks/cfuse_workunit_suites_blogbench.yaml b/suites/fs/basic/tasks/cfuse_workunit_suites_blogbench.yaml
deleted file mode 100644 (file)
index 4c1fcc11ed906ed887c25a16080d7f3279a4268a..0000000000000000000000000000000000000000
--- a/suites/fs/basic/tasks/cfuse_workunit_suites_blogbench.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- workunit:
-    clients:
-      all:
-        - suites/blogbench.sh

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 120000 (symlink)
index 0000000000000000000000000000000000000000..8f2e88a01eee26df56f76507e4d3b9297622793c
--- /dev/null
+++ b/suites/fs/basic/tasks/cfuse_workunit_suites_blogbench.yaml
@@ -0,0 +1 @@
+../../../../cephfs/tasks/cfuse_workunit_suites_blogbench.yaml
\ No newline at end of file

diff --git a/suites/fs/basic/tasks/cfuse_workunit_suites_dbench.yaml b/suites/fs/basic/tasks/cfuse_workunit_suites_dbench.yaml
deleted file mode 100644 (file)
index 41b2bc8edaab2004345e56ae8e43057726720ad6..0000000000000000000000000000000000000000
--- a/suites/fs/basic/tasks/cfuse_workunit_suites_dbench.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- workunit:
-    clients:
-      all:
-        - suites/dbench.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 120000 (symlink)
index 0000000000000000000000000000000000000000..87c056d1b5c08afa78c9a6a71670139bccdaacf1
--- /dev/null
+++ b/suites/fs/basic/tasks/cfuse_workunit_suites_dbench.yaml
@@ -0,0 +1 @@
+../../../../cephfs/tasks/cfuse_workunit_suites_dbench.yaml
\ No newline at end of file

diff --git a/suites/fs/basic/tasks/cfuse_workunit_suites_ffsb.yaml b/suites/fs/basic/tasks/cfuse_workunit_suites_ffsb.yaml
deleted file mode 100644 (file)
index 4a2a627fe5d327bfc03df40ec4d3564c65bf8938..0000000000000000000000000000000000000000
--- a/suites/fs/basic/tasks/cfuse_workunit_suites_ffsb.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-overrides:
-  ceph:
-    conf:
-      osd:
-        filestore flush min: 0
-tasks:
-- workunit:
-    clients:
-      all:
-        - suites/ffsb.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 120000 (symlink)
index 0000000000000000000000000000000000000000..3528badeda1c8addaeab1ca44ef533870b9df0c3
--- /dev/null
+++ b/suites/fs/basic/tasks/cfuse_workunit_suites_ffsb.yaml
@@ -0,0 +1 @@
+../../../../cephfs/tasks/cfuse_workunit_suites_ffsb.yaml
\ No newline at end of file

diff --git a/suites/fs/basic/tasks/cfuse_workunit_suites_fsstress.yaml b/suites/fs/basic/tasks/cfuse_workunit_suites_fsstress.yaml
deleted file mode 100644 (file)
index ddb18fb791aa2a2ba13aabcfe1d79fa158eaf518..0000000000000000000000000000000000000000
--- a/suites/fs/basic/tasks/cfuse_workunit_suites_fsstress.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- workunit:
-    clients:
-      all:
-        - suites/fsstress.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 120000 (symlink)
index 0000000000000000000000000000000000000000..dc3fd3031b2ab80e87e749d1082ba5d5bfdf3b74
--- /dev/null
+++ b/suites/fs/basic/tasks/cfuse_workunit_suites_fsstress.yaml
@@ -0,0 +1 @@
+../../../../cephfs/tasks/cfuse_workunit_suites_fsstress.yaml
\ No newline at end of file

diff --git a/suites/fs/basic/tasks/cfuse_workunit_trivial_sync.yaml b/suites/fs/basic/tasks/cfuse_workunit_trivial_sync.yaml
deleted file mode 100644 (file)
index 36e7411b6385a6ddb05054513a542e546dbcd8d2..0000000000000000000000000000000000000000
--- a/suites/fs/basic/tasks/cfuse_workunit_trivial_sync.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-tasks:
-- workunit:
-    clients:
-      all: [fs/misc/trivial_sync.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 120000 (symlink)
index 0000000000000000000000000000000000000000..55a4c85a1bca7bf451c7135dd6ac90bf42ed3e51
--- /dev/null
+++ b/suites/fs/basic/tasks/cfuse_workunit_trivial_sync.yaml
@@ -0,0 +1 @@
+../../../../cephfs/tasks/cfuse_workunit_trivial_sync.yaml
\ No newline at end of file

diff --git a/suites/fs/basic/tasks/libcephfs_interface_tests.yaml b/suites/fs/basic/tasks/libcephfs_interface_tests.yaml
deleted file mode 100644 (file)
index d9a2f9cdc6d36fac42733512de7cbfbb1a56343a..0000000000000000000000000000000000000000
--- a/suites/fs/basic/tasks/libcephfs_interface_tests.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-overrides:
-  ceph-fuse:
-    disabled: true
-tasks:
-- workunit:
-    clients:
-      client.0:
-        - libcephfs/test.sh

diff --git a/suites/fs/basic/tasks/libcephfs_interface_tests.yaml b/suites/fs/basic/tasks/libcephfs_interface_tests.yaml
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..582815a106cdd6a1f48157c326d0762e4cacf502
--- /dev/null
+++ b/suites/fs/basic/tasks/libcephfs_interface_tests.yaml
@@ -0,0 +1 @@
+../../../../cephfs/tasks/libcephfs_interface_tests.yaml
\ No newline at end of file

diff --git a/suites/fs/thrash/tasks/cfuse_workunit_suites_fsstress.yaml b/suites/fs/thrash/tasks/cfuse_workunit_suites_fsstress.yaml
deleted file mode 100644 (file)
index ddb18fb791aa2a2ba13aabcfe1d79fa158eaf518..0000000000000000000000000000000000000000
--- a/suites/fs/thrash/tasks/cfuse_workunit_suites_fsstress.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- workunit:
-    clients:
-      all:
-        - suites/fsstress.sh

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

diff --git a/suites/fs/thrash/tasks/cfuse_workunit_trivial_sync.yaml b/suites/fs/thrash/tasks/cfuse_workunit_trivial_sync.yaml
deleted file mode 100644 (file)
index 36e7411b6385a6ddb05054513a542e546dbcd8d2..0000000000000000000000000000000000000000
--- a/suites/fs/thrash/tasks/cfuse_workunit_trivial_sync.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-tasks:
-- workunit:
-    clients:
-      all: [fs/misc/trivial_sync.sh]

diff --git a/suites/fs/thrash/tasks/cfuse_workunit_trivial_sync.yaml b/suites/fs/thrash/tasks/cfuse_workunit_trivial_sync.yaml
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..55a4c85a1bca7bf451c7135dd6ac90bf42ed3e51
--- /dev/null
+++ b/suites/fs/thrash/tasks/cfuse_workunit_trivial_sync.yaml
@@ -0,0 +1 @@
+../../../../cephfs/tasks/cfuse_workunit_trivial_sync.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
deleted file mode 100644 (file)
index 4c1fcc11ed906ed887c25a16080d7f3279a4268a..0000000000000000000000000000000000000000
--- a/suites/fs/traceless/tasks/cfuse_workunit_suites_blogbench.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- workunit:
-    clients:
-      all:
-        - suites/blogbench.sh

diff --git a/suites/fs/traceless/tasks/cfuse_workunit_suites_blogbench.yaml b/suites/fs/traceless/tasks/cfuse_workunit_suites_blogbench.yaml
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..8f2e88a01eee26df56f76507e4d3b9297622793c
--- /dev/null
+++ b/suites/fs/traceless/tasks/cfuse_workunit_suites_blogbench.yaml
@@ -0,0 +1 @@
+../../../../cephfs/tasks/cfuse_workunit_suites_blogbench.yaml
\ No newline at end of file

diff --git a/suites/fs/traceless/tasks/cfuse_workunit_suites_dbench.yaml b/suites/fs/traceless/tasks/cfuse_workunit_suites_dbench.yaml
deleted file mode 100644 (file)
index 41b2bc8edaab2004345e56ae8e43057726720ad6..0000000000000000000000000000000000000000
--- a/suites/fs/traceless/tasks/cfuse_workunit_suites_dbench.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- workunit:
-    clients:
-      all:
-        - suites/dbench.sh

diff --git a/suites/fs/traceless/tasks/cfuse_workunit_suites_dbench.yaml b/suites/fs/traceless/tasks/cfuse_workunit_suites_dbench.yaml
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..87c056d1b5c08afa78c9a6a71670139bccdaacf1
--- /dev/null
+++ b/suites/fs/traceless/tasks/cfuse_workunit_suites_dbench.yaml
@@ -0,0 +1 @@
+../../../../cephfs/tasks/cfuse_workunit_suites_dbench.yaml
\ No newline at end of file

diff --git a/suites/fs/traceless/tasks/cfuse_workunit_suites_ffsb.yaml b/suites/fs/traceless/tasks/cfuse_workunit_suites_ffsb.yaml
deleted file mode 100644 (file)
index 4a2a627fe5d327bfc03df40ec4d3564c65bf8938..0000000000000000000000000000000000000000
--- a/suites/fs/traceless/tasks/cfuse_workunit_suites_ffsb.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-overrides:
-  ceph:
-    conf:
-      osd:
-        filestore flush min: 0
-tasks:
-- workunit:
-    clients:
-      all:
-        - suites/ffsb.sh

diff --git a/suites/fs/traceless/tasks/cfuse_workunit_suites_ffsb.yaml b/suites/fs/traceless/tasks/cfuse_workunit_suites_ffsb.yaml
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..3528badeda1c8addaeab1ca44ef533870b9df0c3
--- /dev/null
+++ b/suites/fs/traceless/tasks/cfuse_workunit_suites_ffsb.yaml
@@ -0,0 +1 @@
+../../../../cephfs/tasks/cfuse_workunit_suites_ffsb.yaml
\ No newline at end of file

diff --git a/suites/fs/traceless/tasks/cfuse_workunit_suites_fsstress.yaml b/suites/fs/traceless/tasks/cfuse_workunit_suites_fsstress.yaml
deleted file mode 100644 (file)
index ddb18fb791aa2a2ba13aabcfe1d79fa158eaf518..0000000000000000000000000000000000000000
--- a/suites/fs/traceless/tasks/cfuse_workunit_suites_fsstress.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- workunit:
-    clients:
-      all:
-        - suites/fsstress.sh

diff --git a/suites/fs/traceless/tasks/cfuse_workunit_suites_fsstress.yaml b/suites/fs/traceless/tasks/cfuse_workunit_suites_fsstress.yaml
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..dc3fd3031b2ab80e87e749d1082ba5d5bfdf3b74
--- /dev/null
+++ b/suites/fs/traceless/tasks/cfuse_workunit_suites_fsstress.yaml
@@ -0,0 +1 @@
+../../../../cephfs/tasks/cfuse_workunit_suites_fsstress.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
deleted file mode 100644 (file)
index 41b2bc8edaab2004345e56ae8e43057726720ad6..0000000000000000000000000000000000000000
--- a/suites/fs/verify/tasks/cfuse_workunit_suites_dbench.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- workunit:
-    clients:
-      all:
-        - suites/dbench.sh

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 120000 (symlink)
index 0000000000000000000000000000000000000000..87c056d1b5c08afa78c9a6a71670139bccdaacf1
--- /dev/null
+++ b/suites/fs/verify/tasks/cfuse_workunit_suites_dbench.yaml
@@ -0,0 +1 @@
+../../../../cephfs/tasks/cfuse_workunit_suites_dbench.yaml
\ No newline at end of file

diff --git a/suites/fs/verify/tasks/cfuse_workunit_suites_fsstress.yaml b/suites/fs/verify/tasks/cfuse_workunit_suites_fsstress.yaml
deleted file mode 100644 (file)
index ddb18fb791aa2a2ba13aabcfe1d79fa158eaf518..0000000000000000000000000000000000000000
--- a/suites/fs/verify/tasks/cfuse_workunit_suites_fsstress.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- workunit:
-    clients:
-      all:
-        - suites/fsstress.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 120000 (symlink)
index 0000000000000000000000000000000000000000..dc3fd3031b2ab80e87e749d1082ba5d5bfdf3b74
--- /dev/null
+++ b/suites/fs/verify/tasks/cfuse_workunit_suites_fsstress.yaml
@@ -0,0 +1 @@
+../../../../cephfs/tasks/cfuse_workunit_suites_fsstress.yaml
\ No newline at end of file

diff --git a/suites/fs/verify/tasks/libcephfs_interface_tests.yaml b/suites/fs/verify/tasks/libcephfs_interface_tests.yaml
deleted file mode 100644 (file)
index 04ab2a4bcfc3296c8d6b4f9c49a52a463dcd7f44..0000000000000000000000000000000000000000
--- a/suites/fs/verify/tasks/libcephfs_interface_tests.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- workunit:
-    clients:
-      client.0:
-        - libcephfs/test.sh

diff --git a/suites/fs/verify/tasks/libcephfs_interface_tests.yaml b/suites/fs/verify/tasks/libcephfs_interface_tests.yaml
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..582815a106cdd6a1f48157c326d0762e4cacf502
--- /dev/null
+++ b/suites/fs/verify/tasks/libcephfs_interface_tests.yaml
@@ -0,0 +1 @@
+../../../../cephfs/tasks/libcephfs_interface_tests.yaml
\ No newline at end of file