From 4be072b2185739ec5c722e414f552ad2eae15caf Mon Sep 17 00:00:00 2001
From: Laura Flores <lflores@ibm.com>
Date: Wed, 19 Jun 2024 16:07:31 -0500
Subject: [PATCH] qa/suites/upgrade/telemetry-upgrade: add more ignorelist
 items and require_osd_release=squid

The warnings added to the ignorelist show up in the cluster log, but they are
expected during upgrades and should thus be ignored.

We also need to set require_osd_release=squid to avoid this warning:
```
cluster [WRN] Health check failed: all OSDs are running squid or later but require_osd_release < squid (OSD_UPGRADE_FINISHED)
```

Signed-off-by: Laura Flores <lflores@ibm.com>
(cherry picked from commit dc65e55d6e88d1dc24b92837f5ae0f4f9aa5169f)
---
 .../telemetry-upgrade/quincy-x/1-tasks.yaml   | 25 +++++++++++++++++++
 .../telemetry-upgrade/reef-x/1-tasks.yaml     | 25 +++++++++++++++++++
 2 files changed, 50 insertions(+)

diff --git a/qa/suites/upgrade/telemetry-upgrade/quincy-x/1-tasks.yaml b/qa/suites/upgrade/telemetry-upgrade/quincy-x/1-tasks.yaml
index cd6609a6d41..b2bb9471656 100644
--- a/qa/suites/upgrade/telemetry-upgrade/quincy-x/1-tasks.yaml
+++ b/qa/suites/upgrade/telemetry-upgrade/quincy-x/1-tasks.yaml
@@ -1,3 +1,22 @@
+overrides:
+  ceph:
+    log-ignorelist:
+      - mons down
+      - mon down
+      - MON_DOWN
+      - out of quorum
+      - PG_
+      - OSD_DOWN
+      - POOL_APP_NOT_ENABLED
+      - pgs degraded
+      - pg degraded
+      - object degraded
+      - objects degraded
+      - FS_DEGRADED
+      - MDS_ALL_DOWN
+      - OSD_UPGRADE_FINISHED
+      - do not have an application enabled
+      - is down
 tasks:
 - install:
     branch: quincy
@@ -44,6 +63,12 @@ tasks:
             - ceph versions | jq -e '.overall | keys' | grep $sha1
     - print: "**** done end upgrade..."
 
+    - print: "**** done set require-osd-release ..."
+    - cephadm.shell:
+        env: [sha1]
+        mon.a:
+            - ceph osd require-osd-release squid
+
     - print: "**** done start telemetry x..."
     - workunit:
         clients:
diff --git a/qa/suites/upgrade/telemetry-upgrade/reef-x/1-tasks.yaml b/qa/suites/upgrade/telemetry-upgrade/reef-x/1-tasks.yaml
index 5163a54fe24..070214e4e77 100644
--- a/qa/suites/upgrade/telemetry-upgrade/reef-x/1-tasks.yaml
+++ b/qa/suites/upgrade/telemetry-upgrade/reef-x/1-tasks.yaml
@@ -1,3 +1,22 @@
+overrides:
+  ceph:
+    log-ignorelist:
+      - mons down
+      - mon down
+      - MON_DOWN
+      - out of quorum
+      - PG_
+      - OSD_DOWN
+      - POOL_APP_NOT_ENABLED
+      - pgs degraded
+      - pg degraded
+      - object degraded
+      - objects degraded
+      - FS_DEGRADED
+      - MDS_ALL_DOWN
+      - OSD_UPGRADE_FINISHED
+      - do not have an application enabled
+      - is down
 tasks:
 - install:
     branch: reef
@@ -44,6 +63,12 @@ tasks:
             - ceph versions | jq -e '.overall | keys' | grep $sha1
     - print: "**** done end upgrade..."
 
+    - print: "**** done set require-osd-release ..."
+    - cephadm.shell:
+        env: [sha1]
+        mon.a:
+            - ceph osd require-osd-release squid
+
     - print: "**** done start telemetry x..."
     - workunit:
         clients:
-- 
2.39.5