From: Ilya Dryomov <idryomov@gmail.com>
Date: Sun, 8 Dec 2024 16:01:39 +0000 (+0100)
Subject: qa/suites/upgrade/*-x: ignore telemetry re-opt-in nudges
X-Git-Tag: v19.2.3~326^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d701631d9550b6a02d5319bafcb70beab0ac701c;p=ceph.git

qa/suites/upgrade/*-x: ignore telemetry re-opt-in nudges

Cover warnings like

  [WRN] Health check failed: Telemetry requires re-opt-in (TELEMETRY_CHANGED)" in cluster log
  [WRN] telemetry module includes new collections; please re-opt-in to new collections with `ceph telemetry on`" in cluster log

Re-opt-in can happen in a respective workunit
(test_telemetry_quincy_x.sh or test_telemetry_reef_x.sh), but it gets
run only at the very end after both "workload" and "upgrade-sequence"
complete.  Over an hour passes in the interim:

  2024-12-08T00:06:31.197 INFO:teuthology.task.print:**** done end upgrade, wait...
  ...
  2024-12-08T01:28:38.588 INFO:tasks.workunit:Running workunit test_telemetry_reef_x.sh...

The existing list is now duplicated in 0-start.yaml, so replace it
entirely.

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

diff --git a/qa/suites/upgrade/quincy-x/parallel/1-tasks.yaml b/qa/suites/upgrade/quincy-x/parallel/1-tasks.yaml
index e27c7c0f0928..f7167975aa9f 100644
--- a/qa/suites/upgrade/quincy-x/parallel/1-tasks.yaml
+++ b/qa/suites/upgrade/quincy-x/parallel/1-tasks.yaml
@@ -1,11 +1,8 @@
 overrides:
   ceph:
     log-ignorelist:
-      - mons down
-      - mon down
-      - MON_DOWN
-      - out of quorum
-      - PG_AVAILABILITY
+      - Telemetry requires re-opt-in
+      - telemetry module includes new collections
 tasks:
 - install:
     branch: quincy
diff --git a/qa/suites/upgrade/reef-x/parallel/1-tasks.yaml b/qa/suites/upgrade/reef-x/parallel/1-tasks.yaml
index ce4e0cc228bb..b5160c2dd00e 100644
--- a/qa/suites/upgrade/reef-x/parallel/1-tasks.yaml
+++ b/qa/suites/upgrade/reef-x/parallel/1-tasks.yaml
@@ -1,12 +1,8 @@
 overrides:
   ceph:
     log-ignorelist:
-      - mons down
-      - mon down
-      - MON_DOWN
-      - out of quorum
-      - PG_AVAILABILITY
-      - PG_DEGRADED
+      - Telemetry requires re-opt-in
+      - telemetry module includes new collections
 tasks:
 - install:
     branch: reef