From: Ilya Dryomov <idryomov@gmail.com>
Date: Sat, 7 Dec 2024 17:39:06 +0000 (+0100)
Subject: qa/suites/upgrade/*-x: add OSD_UPGRADE_FINISHED to log-ignorelist
X-Git-Tag: v19.2.3~326^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5349ae95684ef1076dadb1c8aba782030c6c814b;p=ceph.git

qa/suites/upgrade/*-x: add OSD_UPGRADE_FINISHED to log-ignorelist

Cover warnings like

  [WRN] Health check failed: all OSDs are running squid or later but require_osd_release < squid (OSD_UPGRADE_FINISHED)" in cluster log

They are inherently transient and should ideally be delayed for a grace
period instead of being raised immediately just to be ignored.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit ad51e25d39e70db236b4f4750561d3b690c49ff8)
---

diff --git a/qa/suites/upgrade/quincy-x/parallel/0-start.yaml b/qa/suites/upgrade/quincy-x/parallel/0-start.yaml
index e94c20b5b893..a0a5904c0a51 100644
--- a/qa/suites/upgrade/quincy-x/parallel/0-start.yaml
+++ b/qa/suites/upgrade/quincy-x/parallel/0-start.yaml
@@ -47,3 +47,4 @@ overrides:
       - pg .* is .*degraded
       - FS_DEGRADED
       - OSDMAP_FLAGS
+      - OSD_UPGRADE_FINISHED
diff --git a/qa/suites/upgrade/quincy-x/stress-split/1-start.yaml b/qa/suites/upgrade/quincy-x/stress-split/1-start.yaml
index ad111ad4e0b7..a59e703c6715 100644
--- a/qa/suites/upgrade/quincy-x/stress-split/1-start.yaml
+++ b/qa/suites/upgrade/quincy-x/stress-split/1-start.yaml
@@ -16,6 +16,7 @@ overrides:
       - pg .* is .*degraded
       - FS_DEGRADED
       - OSDMAP_FLAGS
+      - OSD_UPGRADE_FINISHED
 tasks:
 - install:
     branch: quincy
diff --git a/qa/suites/upgrade/reef-x/parallel/0-start.yaml b/qa/suites/upgrade/reef-x/parallel/0-start.yaml
index e94c20b5b893..a0a5904c0a51 100644
--- a/qa/suites/upgrade/reef-x/parallel/0-start.yaml
+++ b/qa/suites/upgrade/reef-x/parallel/0-start.yaml
@@ -47,3 +47,4 @@ overrides:
       - pg .* is .*degraded
       - FS_DEGRADED
       - OSDMAP_FLAGS
+      - OSD_UPGRADE_FINISHED
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 ee1be0e2e559..e805c1b8bee1 100644
--- a/qa/suites/upgrade/reef-x/stress-split/1-start.yaml
+++ b/qa/suites/upgrade/reef-x/stress-split/1-start.yaml
@@ -16,6 +16,7 @@ overrides:
       - pg .* is .*degraded
       - FS_DEGRADED
       - OSDMAP_FLAGS
+      - OSD_UPGRADE_FINISHED
 tasks:
 - install:
     branch: reef