qa: use cephfs standard configs for kclient

Specifically, qa/cephfs/begin.yaml.

Fixes: http://tracker.ceph.com/issues/26967
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>

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

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

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

diff --git a/qa/suites/kcephfs/mixed-clients/begin.yaml b/qa/suites/kcephfs/mixed-clients/begin.yaml
new file mode 120000 (symlink)
index 0000000..311d404
--- /dev/null
+++ b/qa/suites/kcephfs/mixed-clients/begin.yaml
@@ -0,0 +1 @@
+.qa/cephfs/begin.yaml
\ No newline at end of file

diff --git a/qa/suites/kcephfs/mixed-clients/tasks/kernel_cfuse_workunits_dbench_iozone.yaml b/qa/suites/kcephfs/mixed-clients/tasks/kernel_cfuse_workunits_dbench_iozone.yaml
index 0121a01c53835e777864ef09e65aea7c7e822b5d..78b2d7611e5b44ecb8329f063a38d3053a5477da 100644 (file)
--- a/qa/suites/kcephfs/mixed-clients/tasks/kernel_cfuse_workunits_dbench_iozone.yaml
+++ b/qa/suites/kcephfs/mixed-clients/tasks/kernel_cfuse_workunits_dbench_iozone.yaml
@@ -1,6 +1,4 @@
 tasks:
-- install:
-- ceph:
 - parallel:
    - user-workload
    - kclient-workload

diff --git a/qa/suites/kcephfs/mixed-clients/tasks/kernel_cfuse_workunits_untarbuild_blogbench.yaml b/qa/suites/kcephfs/mixed-clients/tasks/kernel_cfuse_workunits_untarbuild_blogbench.yaml
index 7b0ce5b5d589d39974ea84ad7f0f807225ff61e4..d637ff989df177a8033ea29a96ada77e0c559839 100644 (file)
--- a/qa/suites/kcephfs/mixed-clients/tasks/kernel_cfuse_workunits_untarbuild_blogbench.yaml
+++ b/qa/suites/kcephfs/mixed-clients/tasks/kernel_cfuse_workunits_untarbuild_blogbench.yaml
@@ -1,6 +1,4 @@
 tasks:
-- install:
-- ceph:
 - parallel:
    - user-workload
    - kclient-workload

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

diff --git a/qa/suites/kcephfs/recovery/mounts/kmounts.yaml b/qa/suites/kcephfs/recovery/mounts/kmounts.yaml
index c18db8f5ea61de68158060580e1db0cae17fe089..c9a1f5b6f2359934cfd7bcde0c42bc94395d683d 100644 (file)
--- a/qa/suites/kcephfs/recovery/mounts/kmounts.yaml
+++ b/qa/suites/kcephfs/recovery/mounts/kmounts.yaml
@@ -1,4 +1,2 @@
 tasks:
-- install:
-- ceph:
 - kclient:

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

diff --git a/qa/suites/kcephfs/thrash/thrashers/default.yaml b/qa/suites/kcephfs/thrash/thrashers/default.yaml
index e628ba6da65a23292c23b2211067a88f24a1b8f3..1829619bd07b20cc09fca38db902fe959299da28 100644 (file)
--- a/qa/suites/kcephfs/thrash/thrashers/default.yaml
+++ b/qa/suites/kcephfs/thrash/thrashers/default.yaml
@@ -1,7 +1,7 @@
-tasks:
-- install:
-- ceph:
+overrides:
+  ceph:
     log-whitelist:
-    - but it is still running
-    - objects unfound and apparently lost
+      - but it is still running
+      - objects unfound and apparently lost
+tasks:
 - thrashosds:

diff --git a/qa/suites/kcephfs/thrash/thrashers/mds.yaml b/qa/suites/kcephfs/thrash/thrashers/mds.yaml
index d5d1f4357b9e111bc6637695a2fd2eb8194c5eb8..ce87575c706e3220fa0d10c62a20c24051175083 100644 (file)
--- a/qa/suites/kcephfs/thrash/thrashers/mds.yaml
+++ b/qa/suites/kcephfs/thrash/thrashers/mds.yaml
@@ -1,9 +1,7 @@
-tasks:
-- install:
-- ceph:
-- mds_thrash:
-
 overrides:
   ceph:
     log-whitelist:
       - not responding, replacing
+
+tasks:
+- mds_thrash:

diff --git a/qa/suites/kcephfs/thrash/thrashers/mon.yaml b/qa/suites/kcephfs/thrash/thrashers/mon.yaml
index aa876d7d4864a1eb6e0f36de942db15f613cf282..d72a99cbc926641cc414dc6765989f9e6ee805bc 100644 (file)
--- a/qa/suites/kcephfs/thrash/thrashers/mon.yaml
+++ b/qa/suites/kcephfs/thrash/thrashers/mon.yaml
@@ -2,9 +2,8 @@ overrides:
   ceph:
     log-whitelist:
     - \(MON_DOWN\)
+
 tasks:
-- install:
-- ceph:
 - mon_thrash:
     revive_delay: 20
     thrash_delay: 1