From: Sage Weil <sage@redhat.com>
Date: Thu, 20 Apr 2017 13:58:17 +0000 (-0400)
Subject: qa/suites/rados/thrash: extra cluster create
X-Git-Tag: v12.0.3~28^2~9
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dc39cbab1816f8c72ab821781fad273e8afb3b98;p=ceph.git

qa/suites/rados/thrash: extra cluster create

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/qa/suites/rados/thrash/ceph.yaml b/qa/suites/rados/thrash/ceph.yaml
new file mode 100644
index 000000000000..2030acb90836
--- /dev/null
+++ b/qa/suites/rados/thrash/ceph.yaml
@@ -0,0 +1,3 @@
+tasks:
+- install:
+- ceph:
diff --git a/qa/suites/rados/thrash/thrashers/default.yaml b/qa/suites/rados/thrash/thrashers/default.yaml
index 5df84bedabeb..e2f3c64c1465 100644
--- a/qa/suites/rados/thrash/thrashers/default.yaml
+++ b/qa/suites/rados/thrash/thrashers/default.yaml
@@ -1,6 +1,5 @@
-tasks:
-- install:
-- ceph:
+overrides:
+  ceph:
     log-whitelist:
     - wrongly marked me down
     - objects unfound and apparently lost
@@ -11,6 +10,7 @@ tasks:
         osd scrub max interval: 120
         osd max backfills: 3
         osd snap trim sleep: 2
+tasks:
 - thrashosds:
     timeout: 1200
     chance_pgnum_grow: 1
diff --git a/qa/suites/rados/thrash/thrashers/mapgap.yaml b/qa/suites/rados/thrash/thrashers/mapgap.yaml
index 0ac5cfc49c69..b039b6198111 100644
--- a/qa/suites/rados/thrash/thrashers/mapgap.yaml
+++ b/qa/suites/rados/thrash/thrashers/mapgap.yaml
@@ -1,5 +1,9 @@
 overrides:
   ceph:
+    log-whitelist:
+    - wrongly marked me down
+    - objects unfound and apparently lost
+    - osd_map_cache_size
     conf:
       mon:
         mon min osdmap epochs: 2
@@ -10,12 +14,6 @@ overrides:
         osd scrub during recovery: false
         osd max backfills: 6
 tasks:
-- install:
-- ceph:
-    log-whitelist:
-    - wrongly marked me down
-    - objects unfound and apparently lost
-    - osd_map_cache_size
 - thrashosds:
     timeout: 1800
     chance_pgnum_grow: 0.25
diff --git a/qa/suites/rados/thrash/thrashers/morepggrow.yaml b/qa/suites/rados/thrash/thrashers/morepggrow.yaml
index a22f80c58455..5565d701e32d 100644
--- a/qa/suites/rados/thrash/thrashers/morepggrow.yaml
+++ b/qa/suites/rados/thrash/thrashers/morepggrow.yaml
@@ -1,6 +1,5 @@
-tasks:
-- install:
-- ceph:
+overrides:
+  ceph:
     conf:
       osd:
         osd scrub min interval: 60
@@ -13,6 +12,7 @@ tasks:
     log-whitelist:
     - wrongly marked me down
     - objects unfound and apparently lost
+tasks:
 - thrashosds:
     timeout: 1200
     chance_pgnum_grow: 3
diff --git a/qa/suites/rados/thrash/thrashers/none.yaml b/qa/suites/rados/thrash/thrashers/none.yaml
index 2030acb90836..e69de29bb2d1 100644
--- a/qa/suites/rados/thrash/thrashers/none.yaml
+++ b/qa/suites/rados/thrash/thrashers/none.yaml
@@ -1,3 +0,0 @@
-tasks:
-- install:
-- ceph:
diff --git a/qa/suites/rados/thrash/thrashers/pggrow.yaml b/qa/suites/rados/thrash/thrashers/pggrow.yaml
index 30d8957c77b4..817bbd48578e 100644
--- a/qa/suites/rados/thrash/thrashers/pggrow.yaml
+++ b/qa/suites/rados/thrash/thrashers/pggrow.yaml
@@ -1,6 +1,5 @@
-tasks:
-- install:
-- ceph:
+overrides:
+  ceph:
     log-whitelist:
     - wrongly marked me down
     - objects unfound and apparently lost
@@ -11,6 +10,7 @@ tasks:
         filestore odsync write: true
         osd max backfills: 2
         osd snap trim sleep: .5
+tasks:
 - thrashosds:
     timeout: 1200
     chance_pgnum_grow: 2