From: Sage Weil <sage@redhat.com>
Date: Sat, 5 Aug 2017 02:28:54 +0000 (-0400)
Subject: qa/suites/upgrade/*-x/parallel: whitelist more stuff
X-Git-Tag: v12.1.3~59^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=622e950e433ddb2f638466d4c9b494ec12700c1b;p=ceph.git

qa/suites/upgrade/*-x/parallel: whitelist more stuff

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

diff --git a/qa/suites/upgrade/jewel-x/parallel/1-jewel-install/jewel.yaml b/qa/suites/upgrade/jewel-x/parallel/1-jewel-install/jewel.yaml
index 309f929336a6..ffc68b786442 100644
--- a/qa/suites/upgrade/jewel-x/parallel/1-jewel-install/jewel.yaml
+++ b/qa/suites/upgrade/jewel-x/parallel/1-jewel-install/jewel.yaml
@@ -16,6 +16,9 @@ tasks:
       - \(FS_
       - \(MDS_
       - \(OSD_
+      - \(MON_DOWN\)
+      - \(CACHE_POOL_NO_HIT_SET\)
+      - Monitor daemon marked osd
     conf:
       mon:
         mon warn on pool no app: false
diff --git a/qa/suites/upgrade/kraken-x/parallel/1-kraken-install/kraken.yaml b/qa/suites/upgrade/kraken-x/parallel/1-kraken-install/kraken.yaml
index 5574d22a7d5d..cf6ea41da4cf 100644
--- a/qa/suites/upgrade/kraken-x/parallel/1-kraken-install/kraken.yaml
+++ b/qa/suites/upgrade/kraken-x/parallel/1-kraken-install/kraken.yaml
@@ -8,9 +8,14 @@ tasks:
     branch: kraken
 - print: "**** done installing kraken"
 - ceph:
-    conf:
-      mon:
-        mon warn on pool no app: false
+    log-whitelist:
+      - overall HEALTH_
+      - \(FS_
+      - \(MDS_
+      - \(OSD_
+      - \(MON_DOWN\)
+      - \(CACHE_POOL_NO_HIT_SET\)
+      - Monitor daemon marked osd
 - print: "**** done ceph"
 - install.upgrade:
     mon.a: