From d701631d9550b6a02d5319bafcb70beab0ac701c Mon Sep 17 00:00:00 2001 From: Ilya Dryomov Date: Sun, 8 Dec 2024 17:01:39 +0100 Subject: [PATCH] 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 (cherry picked from commit cb2c5e3a604d6c4a939c28487b31972651f2a39d) --- qa/suites/upgrade/quincy-x/parallel/1-tasks.yaml | 7 ++----- qa/suites/upgrade/reef-x/parallel/1-tasks.yaml | 8 ++------ 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/qa/suites/upgrade/quincy-x/parallel/1-tasks.yaml b/qa/suites/upgrade/quincy-x/parallel/1-tasks.yaml index e27c7c0f092..f7167975aa9 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 ce4e0cc228b..b5160c2dd00 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 -- 2.39.5