suites/fs: unify install/start task creation

Goal is to reduce arbitrary differences between fs suites.

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

diff --git a/cephfs/begin.yaml b/cephfs/begin.yaml
new file mode 100644 (file)
index 0000000..a2e58b0
--- /dev/null
+++ b/cephfs/begin.yaml
@@ -0,0 +1,3 @@
+tasks:
+  - install:
+  - ceph:

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

diff --git a/suites/fs/32bits/mount/ceph-fuse.yaml b/suites/fs/32bits/mount/ceph-fuse.yaml
index 3b3f36278ebdbcdb60eeb66d99eb3e422bf2612f..3b9d833f3c8a63ccaca3a0aeef4f2a9d9b984ace 100644 (file)
--- a/suites/fs/32bits/mount/ceph-fuse.yaml
+++ b/suites/fs/32bits/mount/ceph-fuse.yaml
@@ -4,6 +4,4 @@ overrides:
       client:
         client use faked inos: true
 tasks:
-- install:
-- ceph:
 - ceph-fuse:

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

diff --git a/suites/fs/basic/inline/no.yaml b/suites/fs/basic/inline/no.yaml
index 2030acb90836ccb748eab56844f8342763b3dd8c..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/suites/fs/basic/inline/no.yaml
+++ b/suites/fs/basic/inline/no.yaml
@@ -1,3 +0,0 @@
-tasks:
-- install:
-- ceph:

diff --git a/suites/fs/basic/inline/yes.yaml b/suites/fs/basic/inline/yes.yaml
index fce64c6c11d7ad3a7efa43f2620e73e3aed8889d..ae5222f6bcba2f22a5c61fa110a229524a2146c5 100644 (file)
--- a/suites/fs/basic/inline/yes.yaml
+++ b/suites/fs/basic/inline/yes.yaml
@@ -1,6 +1,4 @@
 tasks:
-- install:
-- ceph:
 - exec:
     client.0:
       - sudo ceph mds set inline_data true --yes-i-really-mean-it

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

diff --git a/suites/fs/multiclient/mount/ceph-fuse.yaml b/suites/fs/multiclient/mount/ceph-fuse.yaml
index 37ac5b69e61b3112140d0b22373e555ef5224e8e..e3c34a1f6046274ec984f73a20bf651e8bd89bc9 100644 (file)
--- a/suites/fs/multiclient/mount/ceph-fuse.yaml
+++ b/suites/fs/multiclient/mount/ceph-fuse.yaml
@@ -1,4 +1,2 @@
 tasks:
-- install:
-- ceph:
 - ceph-fuse:

diff --git a/suites/fs/multiclient/mount/kclient.yaml.disabled b/suites/fs/multiclient/mount/kclient.yaml.disabled
index 04adb48b63f8f60094db01ae00063457f1f5cb58..f00f16aea2250dfa291aa97d39d887ec522f482c 100644 (file)
--- a/suites/fs/multiclient/mount/kclient.yaml.disabled
+++ b/suites/fs/multiclient/mount/kclient.yaml.disabled
@@ -4,6 +4,4 @@ overrides:
       global:
         ms die on skipped message: false
 tasks:
-- install:
-- ceph:
 - kclient:

diff --git a/suites/fs/multifs/begin.yaml b/suites/fs/multifs/begin.yaml
new file mode 120000 (symlink)
index 0000000..0c4ae31
--- /dev/null
+++ b/suites/fs/multifs/begin.yaml
@@ -0,0 +1 @@
+../../../cephfs/begin.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
index 8092598f4044067f37d50a55c150470bbc9d2b8a..b9d4788d15794e16bf6fd73628eff3453b7b46f5 100644 (file)
--- a/suites/fs/multifs/mounts/ceph-fuse.yaml
+++ b/suites/fs/multifs/mounts/ceph-fuse.yaml
@@ -1,6 +1,4 @@
 tasks:
-- install:
-- ceph:
 - ceph-fuse:
     client.0:
         mounted: false

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

diff --git a/suites/fs/permission/mount/ceph-fuse.yaml b/suites/fs/permission/mount/ceph-fuse.yaml
index 45b33ac5e69de2354d0277ce24c2f58fcc0782eb..6015e3736f38b6bc5a221190bd4c3c7ae6960471 100644 (file)
--- a/suites/fs/permission/mount/ceph-fuse.yaml
+++ b/suites/fs/permission/mount/ceph-fuse.yaml
@@ -5,6 +5,4 @@ overrides:
         fuse default permissions: false
         client acl type: posix_acl
 tasks:
-- install:
-- ceph:
 - ceph-fuse:

diff --git a/suites/fs/recovery/begin.yaml b/suites/fs/recovery/begin.yaml
new file mode 120000 (symlink)
index 0000000..0c4ae31
--- /dev/null
+++ b/suites/fs/recovery/begin.yaml
@@ -0,0 +1 @@
+../../../cephfs/begin.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
index 687baf8a53c9ba318af61165e3def629689516ed..b38965de641da91321bbd3e2e052fd13c2af5bd1 100644 (file)
--- a/suites/fs/recovery/mounts/ceph-fuse.yaml
+++ b/suites/fs/recovery/mounts/ceph-fuse.yaml
@@ -1,6 +1,4 @@
 tasks:
-- install:
-- ceph:
 - ceph-fuse:
     client.0:
         mounted: false

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

diff --git a/suites/fs/snaps/mount/ceph-fuse.yaml b/suites/fs/snaps/mount/ceph-fuse.yaml
index 37ac5b69e61b3112140d0b22373e555ef5224e8e..e3c34a1f6046274ec984f73a20bf651e8bd89bc9 100644 (file)
--- a/suites/fs/snaps/mount/ceph-fuse.yaml
+++ b/suites/fs/snaps/mount/ceph-fuse.yaml
@@ -1,4 +1,2 @@
 tasks:
-- install:
-- ceph:
 - ceph-fuse:

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

diff --git a/suites/fs/standbyreplay/mount/fuse.yaml b/suites/fs/standbyreplay/mount/fuse.yaml
index 5769caaaaace0555a137a11878739122a7baf0a7..dd489e7b6d1e07e0137cfed5f7e201403b035038 100644 (file)
--- a/suites/fs/standbyreplay/mount/fuse.yaml
+++ b/suites/fs/standbyreplay/mount/fuse.yaml
@@ -1,5 +1,2 @@
-
 tasks:
-    - install:
-    - ceph:
-    - ceph_fuse:
+  - ceph_fuse:

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

diff --git a/suites/fs/thrash/ceph/base.yaml b/suites/fs/thrash/ceph/base.yaml
deleted file mode 100644 (file)
index 2030acb..0000000
--- a/suites/fs/thrash/ceph/base.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-tasks:
-- install:
-- ceph:

diff --git a/suites/fs/traceless/begin.yaml b/suites/fs/traceless/begin.yaml
new file mode 120000 (symlink)
index 0000000..0c4ae31
--- /dev/null
+++ b/suites/fs/traceless/begin.yaml
@@ -0,0 +1 @@
+../../../cephfs/begin.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 ed9d92d5bda1e4307bfa27d0fc4e0bf4032a178e..09898e16bda4e9055b4f8c9f65356f8f00c7213a 100644 (file)
--- a/suites/fs/traceless/tasks/cfuse_workunit_suites_blogbench.yaml
+++ b/suites/fs/traceless/tasks/cfuse_workunit_suites_blogbench.yaml
@@ -1,6 +1,4 @@
 tasks:
-- install:
-- ceph:
 - ceph-fuse:
 - workunit:
     clients:

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

diff --git a/suites/fs/traceless/tasks/cfuse_workunit_suites_ffsb.yaml b/suites/fs/traceless/tasks/cfuse_workunit_suites_ffsb.yaml
index 652a3a62f592b5c756fed852bb99057eeb3c94d8..8600816003499db7d8b3bdfb2cc5ef2c7d66168a 100644 (file)
--- a/suites/fs/traceless/tasks/cfuse_workunit_suites_ffsb.yaml
+++ b/suites/fs/traceless/tasks/cfuse_workunit_suites_ffsb.yaml
@@ -1,9 +1,9 @@
-tasks:
-- install:
-- ceph:
+overrides:
+  ceph:
     conf:
       osd:
         filestore flush min: 0
+tasks:
 - ceph-fuse:
 - workunit:
     clients:

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

diff --git a/suites/fs/verify/begin.yaml b/suites/fs/verify/begin.yaml
new file mode 120000 (symlink)
index 0000000..0c4ae31
--- /dev/null
+++ b/suites/fs/verify/begin.yaml
@@ -0,0 +1 @@
+../../../cephfs/begin.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 4a8deb7f48918a89ea780c9ef709d09657b28a6d..ad96b4c5e7fcfe50492affcd7ca05f528dda3721 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:
-- install:
 - ceph-fuse:
 - workunit:
     clients:

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

diff --git a/suites/fs/verify/tasks/libcephfs_interface_tests.yaml b/suites/fs/verify/tasks/libcephfs_interface_tests.yaml
index 22d1f1421616822236fe4ad54491da548feb01e4..0b1d41fea5c444e51203829976e0ce8f163b4d27 100644 (file)
--- a/suites/fs/verify/tasks/libcephfs_interface_tests.yaml
+++ b/suites/fs/verify/tasks/libcephfs_interface_tests.yaml
@@ -1,6 +1,4 @@
 tasks:
-- install:
-- ceph:
 - ceph-fuse:
 - workunit:
     clients: