From: Sage Weil <sage@redhat.com>
Date: Thu, 20 Apr 2017 14:03:47 +0000 (-0400)
Subject: qa/suites/rados/thrash-erasure-code: factor out cluster create
X-Git-Tag: v12.0.3~28^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6e20af4fd1166ede7c33eb1ff3d728f71da54a21;p=ceph.git

qa/suites/rados/thrash-erasure-code: factor out cluster create

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

diff --git a/qa/suites/rados/thrash-erasure-code/ceph.yaml b/qa/suites/rados/thrash-erasure-code/ceph.yaml
new file mode 100644
index 000000000000..2030acb90836
--- /dev/null
+++ b/qa/suites/rados/thrash-erasure-code/ceph.yaml
@@ -0,0 +1,3 @@
+tasks:
+- install:
+- ceph:
diff --git a/qa/suites/rados/thrash-erasure-code/thrashers/default.yaml b/qa/suites/rados/thrash-erasure-code/thrashers/default.yaml
index 211d99a64fb4..89adf041696b 100644
--- a/qa/suites/rados/thrash-erasure-code/thrashers/default.yaml
+++ b/qa/suites/rados/thrash-erasure-code/thrashers/default.yaml
@@ -1,6 +1,5 @@
-tasks:
-- install:
-- ceph:
+overrides:
+  ceph:
     log-whitelist:
     - wrongly marked me down
     - objects unfound and apparently lost
@@ -10,6 +9,7 @@ tasks:
         osd scrub min interval: 60
         osd scrub max interval: 120
         osd max backfills: 2
+tasks:
 - thrashosds:
     timeout: 1200
     chance_pgnum_grow: 1
diff --git a/qa/suites/rados/thrash-erasure-code/thrashers/fastread.yaml b/qa/suites/rados/thrash-erasure-code/thrashers/fastread.yaml
index 8f7c455c693c..d0ce8a319f85 100644
--- a/qa/suites/rados/thrash-erasure-code/thrashers/fastread.yaml
+++ b/qa/suites/rados/thrash-erasure-code/thrashers/fastread.yaml
@@ -1,6 +1,5 @@
-tasks:
-- install:
-- ceph:
+overrides:
+  ceph:
     log-whitelist:
     - wrongly marked me down
     - objects unfound and apparently lost
@@ -12,6 +11,7 @@ tasks:
         osd scrub min interval: 60
         osd scrub max interval: 120
         osd max backfills: 3
+tasks:
 - thrashosds:
     timeout: 1200
     chance_pgnum_grow: 1
diff --git a/qa/suites/rados/thrash-erasure-code/thrashers/mapgap.yaml b/qa/suites/rados/thrash-erasure-code/thrashers/mapgap.yaml
index bd448e27285a..2822eeffc8a3 100644
--- a/qa/suites/rados/thrash-erasure-code/thrashers/mapgap.yaml
+++ b/qa/suites/rados/thrash-erasure-code/thrashers/mapgap.yaml
@@ -8,13 +8,11 @@ overrides:
         osd scrub min interval: 60
         osd scrub max interval: 120
         osd max backfills: 5
-tasks:
-- install:
-- ceph:
     log-whitelist:
     - wrongly marked me down
     - objects unfound and apparently lost
     - osd_map_cache_size
+tasks:
 - thrashosds:
     timeout: 1800
     chance_pgnum_grow: 1
diff --git a/qa/suites/rados/thrash-erasure-code/thrashers/morepggrow.yaml b/qa/suites/rados/thrash-erasure-code/thrashers/morepggrow.yaml
index 3fe730673b6a..6972cfedf69e 100644
--- a/qa/suites/rados/thrash-erasure-code/thrashers/morepggrow.yaml
+++ b/qa/suites/rados/thrash-erasure-code/thrashers/morepggrow.yaml
@@ -1,6 +1,5 @@
-tasks:
-- install:
-- ceph:
+overrides:
+  ceph:
     conf:
       osd:
         osd scrub min interval: 60
@@ -9,6 +8,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-erasure-code/thrashers/pggrow.yaml b/qa/suites/rados/thrash-erasure-code/thrashers/pggrow.yaml
index ecb239a061e4..e40d9729fc7b 100644
--- a/qa/suites/rados/thrash-erasure-code/thrashers/pggrow.yaml
+++ b/qa/suites/rados/thrash-erasure-code/thrashers/pggrow.yaml
@@ -1,6 +1,5 @@
-tasks:
-- install:
-- ceph:
+overrides:
+  ceph:
     log-whitelist:
     - wrongly marked me down
     - objects unfound and apparently lost
@@ -9,6 +8,7 @@ tasks:
         osd scrub min interval: 60
         osd scrub max interval: 120
         osd max backfills: 4
+tasks:
 - thrashosds:
     timeout: 1200
     chance_pgnum_grow: 2