From: Patrick Donnelly <batrick@batbytes.com>
Date: Sun, 7 Aug 2016 00:48:42 +0000 (-0400)
Subject: suites/fs: unify install/start task creation
X-Git-Tag: v11.1.1~58^2^2~12^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4260dd57e39799d38fbfc905bb993345fcb2ba95;p=ceph.git

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
index 00000000000..a2e58b0fd0a
--- /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
index 00000000000..0c4ae31e919
--- /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 3b3f36278eb..3b9d833f3c8 100644
--- 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
index 00000000000..0c4ae31e919
--- /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 2030acb9083..e69de29bb2d 100644
--- 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 fce64c6c11d..ae5222f6bcb 100644
--- 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
index 00000000000..0c4ae31e919
--- /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 37ac5b69e61..e3c34a1f604 100644
--- 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 04adb48b63f..f00f16aea22 100644
--- 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
index 00000000000..0c4ae31e919
--- /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 8092598f404..b9d4788d157 100644
--- 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
index 00000000000..0c4ae31e919
--- /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 45b33ac5e69..6015e3736f3 100644
--- 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
index 00000000000..0c4ae31e919
--- /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 687baf8a53c..b38965de641 100644
--- 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
index 00000000000..0c4ae31e919
--- /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 37ac5b69e61..e3c34a1f604 100644
--- 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
index 00000000000..0c4ae31e919
--- /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 5769caaaaac..dd489e7b6d1 100644
--- 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
index 00000000000..0c4ae31e919
--- /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
index 2030acb9083..00000000000
--- 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
index 00000000000..0c4ae31e919
--- /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 ed9d92d5bda..09898e16bda 100644
--- 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 e678ed47cc6..ad96b4c5e7f 100644
--- 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 652a3a62f59..86008160034 100644
--- 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 b58487c0785..5908d951b2d 100644
--- 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
index 00000000000..0c4ae31e919
--- /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 4a8deb7f489..ad96b4c5e7f 100644
--- 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 b58487c0785..5908d951b2d 100644
--- 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 22d1f142161..0b1d41fea5c 100644
--- 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: