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 (file)
index 0000000..2030acb
--- /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 211d99a64fb42046784a5765720186deba4010d6..89adf041696b2cca3fee4399896ad2c058b3750a 100644 (file)
--- 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 8f7c455c693c40dd6c58804ee1b9884fdc9bbabc..d0ce8a319f857cdcd7069782a7f99c395e147dad 100644 (file)
--- 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 bd448e27285a83c8f7db6fdead4e941c39f917dc..2822eeffc8a3ae09c9a380fc30a26879385a1cc1 100644 (file)
--- 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 3fe730673b6a6e2c6b173f535aa80f71d993a582..6972cfedf69e3735c0f633715a92c88873c99462 100644 (file)
--- 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 ecb239a061e461a0fbc29b0db792ad45f523d4ca..e40d9729fc7b7067febcc4c574810a2cd4e49b14 100644 (file)
--- 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