From: Patrick Donnelly <batrick@batbytes.com>
Date: Sun, 7 Aug 2016 03:52:58 +0000 (-0400)
Subject: suites/fs: link to common tasks
X-Git-Tag: v11.1.1~58^2^2~12^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=eef0d958ddd6b75f6a2bc07fb61f293e043f0d17;p=ceph.git

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
index 00000000000..4c1fcc11ed9
--- /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
index 00000000000..41b2bc8edaa
--- /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
index 00000000000..4a2a627fe5d
--- /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
index 00000000000..ddb18fb791a
--- /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
index 00000000000..36e7411b638
--- /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
index 00000000000..d9a2f9cdc6d
--- /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
index ddb18fb791a..00000000000
--- 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
index 00000000000..dc3fd3031b2
--- /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
index 4c1fcc11ed9..00000000000
--- 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
index 00000000000..8f2e88a01ee
--- /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
index 41b2bc8edaa..00000000000
--- 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
index 00000000000..87c056d1b5c
--- /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
index 4a2a627fe5d..00000000000
--- 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
index 00000000000..3528badeda1
--- /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
index ddb18fb791a..00000000000
--- 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
index 00000000000..dc3fd3031b2
--- /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
index 36e7411b638..00000000000
--- 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
index 00000000000..55a4c85a1bc
--- /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
index d9a2f9cdc6d..00000000000
--- 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
index 00000000000..582815a106c
--- /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
index ddb18fb791a..00000000000
--- 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
index 00000000000..dc3fd3031b2
--- /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
index 36e7411b638..00000000000
--- 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
index 00000000000..55a4c85a1bc
--- /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
index 4c1fcc11ed9..00000000000
--- 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
index 00000000000..8f2e88a01ee
--- /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
index 41b2bc8edaa..00000000000
--- 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
index 00000000000..87c056d1b5c
--- /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
index 4a2a627fe5d..00000000000
--- 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
index 00000000000..3528badeda1
--- /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
index ddb18fb791a..00000000000
--- 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
index 00000000000..dc3fd3031b2
--- /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
index 41b2bc8edaa..00000000000
--- 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
index 00000000000..87c056d1b5c
--- /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
index ddb18fb791a..00000000000
--- 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
index 00000000000..dc3fd3031b2
--- /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
index 04ab2a4bcfc..00000000000
--- 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
index 00000000000..582815a106c
--- /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