qa/suites/upgrade/reef-x: sync log-ignorelist with quincy-x

Daemons are terminated by cephadm during the upgrade, so health checks
like OSD_DOWN must be ignored.  Since there shouldn't be any fundamental
difference between upgrading from quincy and upgrading from reef, make
quincy-x and reef-x ignorelists the same.

Fixes: https://tracker.ceph.com/issues/69135
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit bb5893f15a861958c1b10f8dce70da17a9b152f6)

diff --git a/qa/suites/upgrade/reef-x/parallel/0-start.yaml b/qa/suites/upgrade/reef-x/parallel/0-start.yaml
index 146bd57960dad6aaa6aaa668861843063fa3cd27..40fbcefe7280df513a25a991caeb0353e1794f6d 100644 (file)
--- a/qa/suites/upgrade/reef-x/parallel/0-start.yaml
+++ b/qa/suites/upgrade/reef-x/parallel/0-start.yaml
@@ -32,4 +32,13 @@ overrides:
       osd:
         osd shutdown pgref assert: true
     log-ignorelist:
-        - PG_DEGRADED
+      - \(POOL_APP_NOT_ENABLED\)
+      - OSD_DOWN
+      - mons down
+      - mon down
+      - MON_DOWN
+      - out of quorum
+      - PG_DEGRADED
+      - Reduced data availability
+      - Degraded data redundancy
+      - OSDMAP_FLAGS

diff --git a/qa/suites/upgrade/reef-x/stress-split/1-start.yaml b/qa/suites/upgrade/reef-x/stress-split/1-start.yaml
index 992f9e1bc36a7f6f65761bfd3a3423466f239640..2528230a372f729708bfe2258dea53994fb17740 100644 (file)
--- a/qa/suites/upgrade/reef-x/stress-split/1-start.yaml
+++ b/qa/suites/upgrade/reef-x/stress-split/1-start.yaml
@@ -1,10 +1,16 @@
 overrides:
   ceph:
     log-ignorelist:
+      - \(POOL_APP_NOT_ENABLED\)
+      - OSD_DOWN
       - mons down
       - mon down
       - MON_DOWN
       - out of quorum
+      - PG_DEGRADED
+      - Reduced data availability
+      - Degraded data redundancy
+      - OSDMAP_FLAGS
       - PG_AVAILABILITY
 tasks:
 - install: