From 8e1201d78c579ff131bf9c0dcd12a2e2f95656f2 Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Wed, 13 May 2026 10:22:05 -0400 Subject: [PATCH] qa/suites/upgrade: use common ignorelist Signed-off-by: Patrick Donnelly (cherry picked from commit b2ac7f6561326f7020159e43737ef8e9fe9248aa) Signed-off-by: Patrick Donnelly Conflicts: qa/suites/upgrade/reef-x/parallel/+ qa/suites/upgrade/reef-x/parallel/overrides/+ qa/suites/upgrade/reef-x/parallel/overrides/upgrade_ignorelist_health.yaml qa/suites/upgrade/reef-x/parallel/upgrade_ignorelist_health.yaml qa/suites/upgrade/squid-x/stress-split/overrides/ignorelist_health.yaml Resolution: tentacle -> reef. Added tentacle-p2p --- .../upgrade_ignorelist_health.yaml} | 0 qa/suites/upgrade/reef-x/parallel/+ | 0 qa/suites/upgrade/reef-x/parallel/overrides/+ | 0 .../parallel/overrides/ignorelist_health.yaml | 19 ---------------- .../overrides/upgrade_ignorelist_health.yaml | 1 + .../overrides/ignorelist_health.yaml | 19 ---------------- .../overrides/upgrade_ignorelist_health.yaml | 1 + .../upgrade/squid-x/parallel/overrides/+ | 0 .../overrides/upgrade_ignorelist_health.yaml | 1 + .../upgrade/squid-x/stress-split/overrides/+ | 0 .../overrides/ignorelist_health.yaml | 22 ------------------- .../overrides/upgrade_ignorelist_health.yaml | 1 + .../upgrade_ignorelist_health.yaml | 1 + .../upgrade_ignorelist_health.yaml | 1 + 14 files changed, 6 insertions(+), 60 deletions(-) rename qa/{suites/upgrade/squid-x/parallel/overrides/ignorelist_health.yaml => overrides/upgrade_ignorelist_health.yaml} (100%) create mode 100644 qa/suites/upgrade/reef-x/parallel/+ create mode 100644 qa/suites/upgrade/reef-x/parallel/overrides/+ delete mode 100644 qa/suites/upgrade/reef-x/parallel/overrides/ignorelist_health.yaml create mode 120000 qa/suites/upgrade/reef-x/parallel/overrides/upgrade_ignorelist_health.yaml delete mode 100644 qa/suites/upgrade/reef-x/stress-split/overrides/ignorelist_health.yaml create mode 120000 qa/suites/upgrade/reef-x/stress-split/overrides/upgrade_ignorelist_health.yaml create mode 100644 qa/suites/upgrade/squid-x/parallel/overrides/+ create mode 120000 qa/suites/upgrade/squid-x/parallel/overrides/upgrade_ignorelist_health.yaml create mode 100644 qa/suites/upgrade/squid-x/stress-split/overrides/+ delete mode 100644 qa/suites/upgrade/squid-x/stress-split/overrides/ignorelist_health.yaml create mode 120000 qa/suites/upgrade/squid-x/stress-split/overrides/upgrade_ignorelist_health.yaml create mode 120000 qa/suites/upgrade/tentacle-p2p/tentacle-p2p-parallel/upgrade_ignorelist_health.yaml create mode 120000 qa/suites/upgrade/tentacle-p2p/tentacle-p2p-stress-split/upgrade_ignorelist_health.yaml diff --git a/qa/suites/upgrade/squid-x/parallel/overrides/ignorelist_health.yaml b/qa/overrides/upgrade_ignorelist_health.yaml similarity index 100% rename from qa/suites/upgrade/squid-x/parallel/overrides/ignorelist_health.yaml rename to qa/overrides/upgrade_ignorelist_health.yaml diff --git a/qa/suites/upgrade/reef-x/parallel/+ b/qa/suites/upgrade/reef-x/parallel/+ new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/qa/suites/upgrade/reef-x/parallel/overrides/+ b/qa/suites/upgrade/reef-x/parallel/overrides/+ new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/qa/suites/upgrade/reef-x/parallel/overrides/ignorelist_health.yaml b/qa/suites/upgrade/reef-x/parallel/overrides/ignorelist_health.yaml deleted file mode 100644 index fa93b2f2ece2..000000000000 --- a/qa/suites/upgrade/reef-x/parallel/overrides/ignorelist_health.yaml +++ /dev/null @@ -1,19 +0,0 @@ -overrides: - ceph: - log-ignorelist: - - MDS_ALL_DOWN - - MDS_UP_LESS_THAN_MAX - - OSD_SLOW_PING_TIME - - reached quota - - running out of quota - - overall HEALTH_ - - CACHE_POOL_NO_HIT_SET - - pool\(s\) full - - POOL_FULL - - SMALLER_PGP_NUM - - SLOW_OPS - - CACHE_POOL_NEAR_FULL - - OBJECT_MISPLACED - - slow request - - noscrub - - nodeep-scrub diff --git a/qa/suites/upgrade/reef-x/parallel/overrides/upgrade_ignorelist_health.yaml b/qa/suites/upgrade/reef-x/parallel/overrides/upgrade_ignorelist_health.yaml new file mode 120000 index 000000000000..00fe2d661d4e --- /dev/null +++ b/qa/suites/upgrade/reef-x/parallel/overrides/upgrade_ignorelist_health.yaml @@ -0,0 +1 @@ +.qa/overrides/upgrade_ignorelist_health.yaml \ No newline at end of file diff --git a/qa/suites/upgrade/reef-x/stress-split/overrides/ignorelist_health.yaml b/qa/suites/upgrade/reef-x/stress-split/overrides/ignorelist_health.yaml deleted file mode 100644 index fa93b2f2ece2..000000000000 --- a/qa/suites/upgrade/reef-x/stress-split/overrides/ignorelist_health.yaml +++ /dev/null @@ -1,19 +0,0 @@ -overrides: - ceph: - log-ignorelist: - - MDS_ALL_DOWN - - MDS_UP_LESS_THAN_MAX - - OSD_SLOW_PING_TIME - - reached quota - - running out of quota - - overall HEALTH_ - - CACHE_POOL_NO_HIT_SET - - pool\(s\) full - - POOL_FULL - - SMALLER_PGP_NUM - - SLOW_OPS - - CACHE_POOL_NEAR_FULL - - OBJECT_MISPLACED - - slow request - - noscrub - - nodeep-scrub diff --git a/qa/suites/upgrade/reef-x/stress-split/overrides/upgrade_ignorelist_health.yaml b/qa/suites/upgrade/reef-x/stress-split/overrides/upgrade_ignorelist_health.yaml new file mode 120000 index 000000000000..00fe2d661d4e --- /dev/null +++ b/qa/suites/upgrade/reef-x/stress-split/overrides/upgrade_ignorelist_health.yaml @@ -0,0 +1 @@ +.qa/overrides/upgrade_ignorelist_health.yaml \ No newline at end of file diff --git a/qa/suites/upgrade/squid-x/parallel/overrides/+ b/qa/suites/upgrade/squid-x/parallel/overrides/+ new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/qa/suites/upgrade/squid-x/parallel/overrides/upgrade_ignorelist_health.yaml b/qa/suites/upgrade/squid-x/parallel/overrides/upgrade_ignorelist_health.yaml new file mode 120000 index 000000000000..00fe2d661d4e --- /dev/null +++ b/qa/suites/upgrade/squid-x/parallel/overrides/upgrade_ignorelist_health.yaml @@ -0,0 +1 @@ +.qa/overrides/upgrade_ignorelist_health.yaml \ No newline at end of file diff --git a/qa/suites/upgrade/squid-x/stress-split/overrides/+ b/qa/suites/upgrade/squid-x/stress-split/overrides/+ new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/qa/suites/upgrade/squid-x/stress-split/overrides/ignorelist_health.yaml b/qa/suites/upgrade/squid-x/stress-split/overrides/ignorelist_health.yaml deleted file mode 100644 index 96c27c534413..000000000000 --- a/qa/suites/upgrade/squid-x/stress-split/overrides/ignorelist_health.yaml +++ /dev/null @@ -1,22 +0,0 @@ -overrides: - ceph: - log-ignorelist: - - \(MDS_ALL_DOWN\) - - \(MDS_UP_LESS_THAN_MAX\) - - \(OSD_SLOW_PING_TIME - - reached quota - - overall HEALTH_ - - \(CACHE_POOL_NO_HIT_SET\) - - \(POOL_FULL\) - - \(SMALLER_PGP_NUM\) - - \(SLOW_OPS\) - - \(CACHE_POOL_NEAR_FULL\) - - \(POOL_APP_NOT_ENABLED\) - - \(PG_AVAILABILITY\) - - \(OBJECT_MISPLACED\) - - slow request - - \(MON_DOWN\) - - noscrub - - nodeep-scrub - - running out of quota - - pool\(s\) full diff --git a/qa/suites/upgrade/squid-x/stress-split/overrides/upgrade_ignorelist_health.yaml b/qa/suites/upgrade/squid-x/stress-split/overrides/upgrade_ignorelist_health.yaml new file mode 120000 index 000000000000..00fe2d661d4e --- /dev/null +++ b/qa/suites/upgrade/squid-x/stress-split/overrides/upgrade_ignorelist_health.yaml @@ -0,0 +1 @@ +.qa/overrides/upgrade_ignorelist_health.yaml \ No newline at end of file diff --git a/qa/suites/upgrade/tentacle-p2p/tentacle-p2p-parallel/upgrade_ignorelist_health.yaml b/qa/suites/upgrade/tentacle-p2p/tentacle-p2p-parallel/upgrade_ignorelist_health.yaml new file mode 120000 index 000000000000..00fe2d661d4e --- /dev/null +++ b/qa/suites/upgrade/tentacle-p2p/tentacle-p2p-parallel/upgrade_ignorelist_health.yaml @@ -0,0 +1 @@ +.qa/overrides/upgrade_ignorelist_health.yaml \ No newline at end of file diff --git a/qa/suites/upgrade/tentacle-p2p/tentacle-p2p-stress-split/upgrade_ignorelist_health.yaml b/qa/suites/upgrade/tentacle-p2p/tentacle-p2p-stress-split/upgrade_ignorelist_health.yaml new file mode 120000 index 000000000000..00fe2d661d4e --- /dev/null +++ b/qa/suites/upgrade/tentacle-p2p/tentacle-p2p-stress-split/upgrade_ignorelist_health.yaml @@ -0,0 +1 @@ +.qa/overrides/upgrade_ignorelist_health.yaml \ No newline at end of file -- 2.47.3