qa/suites/rados/threas-erasure-code-*: fix luminous facet

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

diff --git a/qa/suites/rados/thrash-erasure-code-big/ceph.yaml b/qa/suites/rados/thrash-erasure-code-big/ceph.yaml
new file mode 120000 (symlink)
index 0000000..a2fd139
--- /dev/null
+++ b/qa/suites/rados/thrash-erasure-code-big/ceph.yaml
@@ -0,0 +1 @@
+../thrash/ceph.yaml
\ No newline at end of file

diff --git a/qa/suites/rados/thrash-erasure-code-big/d-require-luminous b/qa/suites/rados/thrash-erasure-code-big/d-require-luminous
new file mode 120000 (symlink)
index 0000000..737aee8
--- /dev/null
+++ b/qa/suites/rados/thrash-erasure-code-big/d-require-luminous
@@ -0,0 +1 @@
+../thrash/d-require-luminous/
\ No newline at end of file

diff --git a/qa/suites/rados/thrash-erasure-code-big/thrashers/default.yaml b/qa/suites/rados/thrash-erasure-code-big/thrashers/default.yaml
index 5acfcc3ddd969985675c8b5df848b0e913e329ca..057a7ecdb6d03ba2594f5ceabd0d4d314730283b 100644 (file)
--- a/qa/suites/rados/thrash-erasure-code-big/thrashers/default.yaml
+++ b/qa/suites/rados/thrash-erasure-code-big/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 min interval: 60
         osd scrub max interval: 120
         osd max backfills: 6
+tasks:
 - thrashosds:
     timeout: 1200
     chance_pgnum_grow: 1

diff --git a/qa/suites/rados/thrash-erasure-code-big/thrashers/fastread.yaml b/qa/suites/rados/thrash-erasure-code-big/thrashers/fastread.yaml
index 5ded6ba7148d8de5704a222d55c140373e841560..ec889775e9e71da4db00639735861d46cd394fd6 100644 (file)
--- a/qa/suites/rados/thrash-erasure-code-big/thrashers/fastread.yaml
+++ b/qa/suites/rados/thrash-erasure-code-big/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: 2
+tasks:
 - thrashosds:
     timeout: 1200
     chance_pgnum_grow: 1

diff --git a/qa/suites/rados/thrash-erasure-code-big/thrashers/mapgap.yaml b/qa/suites/rados/thrash-erasure-code-big/thrashers/mapgap.yaml
index 67720febbcbb0f02aedadb7bf49301d36fbc7006..5e93ac08fd0a7b52743b00bbce474e4ebaf4bb7f 100644 (file)
--- a/qa/suites/rados/thrash-erasure-code-big/thrashers/mapgap.yaml
+++ b/qa/suites/rados/thrash-erasure-code-big/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
@@ -8,12 +12,6 @@ overrides:
         osd scrub min interval: 60
         osd scrub max interval: 120
 tasks:
-- install:
-- ceph:
-    log-whitelist:
-    - wrongly marked me down
-    - objects unfound and apparently lost
-    - osd_map_cache_size
 - thrashosds:
     timeout: 1800
     chance_pgnum_grow: 1

diff --git a/qa/suites/rados/thrash-erasure-code-big/thrashers/morepggrow.yaml b/qa/suites/rados/thrash-erasure-code-big/thrashers/morepggrow.yaml
index f09ec08cfa9c8e14a6f047fc7e71fc60aa0fdbbd..efda9161e430a6223e61812a943fea19297d95b9 100644 (file)
--- a/qa/suites/rados/thrash-erasure-code-big/thrashers/morepggrow.yaml
+++ b/qa/suites/rados/thrash-erasure-code-big/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-big/thrashers/pggrow.yaml b/qa/suites/rados/thrash-erasure-code-big/thrashers/pggrow.yaml
index 1117cddfc1db32c680e30588c38b332572a52b4d..772f2093c94e649cf318544e54b6e9e85ea30af8 100644 (file)
--- a/qa/suites/rados/thrash-erasure-code-big/thrashers/pggrow.yaml
+++ b/qa/suites/rados/thrash-erasure-code-big/thrashers/pggrow.yaml
@@ -1,6 +1,5 @@
-tasks:
-- install:
-- ceph:
+overrides:
+  ceph:
     log-whitelist:
     - wrongly marked me down
     - objects unfound and apparently lost
@@ -8,6 +7,7 @@ tasks:
       osd:
         osd scrub min interval: 60
         osd scrub max interval: 120
+tasks:
 - thrashosds:
     timeout: 1200
     chance_pgnum_grow: 2

diff --git a/qa/suites/rados/thrash-erasure-code-isa/d-require-luminous b/qa/suites/rados/thrash-erasure-code-isa/d-require-luminous
new file mode 120000 (symlink)
index 0000000..737aee8
--- /dev/null
+++ b/qa/suites/rados/thrash-erasure-code-isa/d-require-luminous
@@ -0,0 +1 @@
+../thrash/d-require-luminous/
\ No newline at end of file

diff --git a/qa/suites/rados/thrash-erasure-code-shec/ceph.yaml b/qa/suites/rados/thrash-erasure-code-shec/ceph.yaml
new file mode 120000 (symlink)
index 0000000..a2fd139
--- /dev/null
+++ b/qa/suites/rados/thrash-erasure-code-shec/ceph.yaml
@@ -0,0 +1 @@
+../thrash/ceph.yaml
\ No newline at end of file

diff --git a/qa/suites/rados/thrash-erasure-code-shec/d-require-luminous b/qa/suites/rados/thrash-erasure-code-shec/d-require-luminous
new file mode 120000 (symlink)
index 0000000..737aee8
--- /dev/null
+++ b/qa/suites/rados/thrash-erasure-code-shec/d-require-luminous
@@ -0,0 +1 @@
+../thrash/d-require-luminous/
\ No newline at end of file

diff --git a/qa/suites/rados/thrash-erasure-code-shec/thrashers/default.yaml b/qa/suites/rados/thrash-erasure-code-shec/thrashers/default.yaml
index 2bece1f939be483ee27cab7229a33b72b920a542..5bff561a9fde2b4d3ced860949c873061c0d1938 100644 (file)
--- a/qa/suites/rados/thrash-erasure-code-shec/thrashers/default.yaml
+++ b/qa/suites/rados/thrash-erasure-code-shec/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 min interval: 60
         osd scrub max interval: 120
         osd max backfills: 3
+tasks:
 - thrashosds:
     timeout: 1200
     chance_pgnum_grow: 1