From: Patrick Donnelly <pdonnell@redhat.com>
Date: Mon, 20 Aug 2018 20:51:35 +0000 (-0700)
Subject: qa: use cephfs standard configs for kclient
X-Git-Tag: v12.2.13~43^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=906036a4416fe38d95aa2feb6dd0493387e45db5;p=ceph.git

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>
(cherry picked from commit 862b84c1e8f496be71666c35c11c665c5c259a43)
(cherry picked from commit 8e483d9bb27a193c85b233b6da4231b30b63e0f4)
---

diff --git a/qa/suites/kcephfs/cephfs/begin.yaml b/qa/suites/kcephfs/cephfs/begin.yaml
new file mode 120000
index 00000000000..311d404f7c2
--- /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 2030acb9083..e69de29bb2d 100644
--- 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 fce64c6c11d..ae5222f6bcb 100644
--- 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 mds set 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
index 00000000000..311d404f7c2
--- /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 0121a01c538..78b2d7611e5 100644
--- 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 7b0ce5b5d58..d637ff989df 100644
--- 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
index 00000000000..311d404f7c2
--- /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 c18db8f5ea6..c9a1f5b6f23 100644
--- 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
index 00000000000..311d404f7c2
--- /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 e628ba6da65..1829619bd07 100644
--- 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 d5d1f4357b9..ce87575c706 100644
--- 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 aa876d7d486..d72a99cbc92 100644
--- 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