From: Sage Weil <sage@redhat.com>
Date: Thu, 20 Apr 2017 14:06:32 +0000 (-0400)
Subject: qa/suites/rados/verify: refactor thrash and cluster create
X-Git-Tag: v12.0.3~28^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=83dcc988db417e653e5f4cf66e319237f89128a0;p=ceph.git

qa/suites/rados/verify: refactor thrash and cluster create

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

diff --git a/qa/suites/rados/verify/1thrash/default.yaml b/qa/suites/rados/verify/1thrash/default.yaml
deleted file mode 100644
index 9435b146af67..000000000000
--- a/qa/suites/rados/verify/1thrash/default.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-tasks:
-- install:
-- ceph:
-    log-whitelist:
-    - wrongly marked me down
-    - objects unfound and apparently lost
-- thrashosds:
-    timeout: 1200
-    chance_pgnum_grow: 1
-    chance_pgpnum_fix: 1
diff --git a/qa/suites/rados/verify/1thrash/none.yaml b/qa/suites/rados/verify/1thrash/none.yaml
deleted file mode 100644
index 2030acb90836..000000000000
--- a/qa/suites/rados/verify/1thrash/none.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-tasks:
-- install:
-- ceph:
diff --git a/qa/suites/rados/verify/ceph-thrash/default.yaml b/qa/suites/rados/verify/ceph-thrash/default.yaml
new file mode 100644
index 000000000000..d67ff20a693e
--- /dev/null
+++ b/qa/suites/rados/verify/ceph-thrash/default.yaml
@@ -0,0 +1,10 @@
+overrides:
+  ceph:
+    log-whitelist:
+    - wrongly marked me down
+    - objects unfound and apparently lost
+tasks:
+- thrashosds:
+    timeout: 1200
+    chance_pgnum_grow: 1
+    chance_pgpnum_fix: 1
diff --git a/qa/suites/rados/verify/ceph-thrash/none.yaml b/qa/suites/rados/verify/ceph-thrash/none.yaml
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/qa/suites/rados/verify/ceph.yaml b/qa/suites/rados/verify/ceph.yaml
new file mode 100644
index 000000000000..2030acb90836
--- /dev/null
+++ b/qa/suites/rados/verify/ceph.yaml
@@ -0,0 +1,3 @@
+tasks:
+- install:
+- ceph: