From: Laura Flores <lflores@ibm.com>
Date: Tue, 13 Aug 2024 22:58:17 +0000 (-0500)
Subject: qa/suites/upgrade: ignore MON_DOWN and PG_AVAILABILITY warnings in upgrade tests
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f821cd85bb1c4ea12ea343daa2e953e4267d108d;p=ceph.git

qa/suites/upgrade: ignore MON_DOWN and PG_AVAILABILITY warnings in upgrade tests

Signed-off-by: Laura Flores <lflores@ibm.com>
(cherry picked from commit e225b127eaf5375493bc1a667058de092f10e4dd)
Signed-off-by: Laura Flores <lflores@ibm.com>

Conflicts:
        qa/suites/upgrade/octopus-x/stress-split/1-start.yaml
	qa/suites/upgrade/quincy-x/parallel/1-tasks.yaml
   - octopus-x/stress-split didn't have an override section yet, while
     main already did. So, I had to add a new section and remove stuff other
     warnings (such as OSD_DOWN) that are out of scope for this cherry-pick.
   - quincy-x tests do not exist on the quincy branch, so I had to remove these
     from the cherry-pick modifications.
---

diff --git a/qa/suites/upgrade/octopus-x/parallel/1-tasks.yaml b/qa/suites/upgrade/octopus-x/parallel/1-tasks.yaml
index 47731267dcb..4617dd3b53f 100644
--- a/qa/suites/upgrade/octopus-x/parallel/1-tasks.yaml
+++ b/qa/suites/upgrade/octopus-x/parallel/1-tasks.yaml
@@ -1,3 +1,11 @@
+overrides:
+  ceph:
+    log-ignorelist:
+      - mons down
+      - mon down
+      - MON_DOWN
+      - out of quorum
+      - PG_AVAILABILITY
 tasks:
 - install:
     branch: octopus
diff --git a/qa/suites/upgrade/octopus-x/stress-split/1-start.yaml b/qa/suites/upgrade/octopus-x/stress-split/1-start.yaml
index c896fbfcf19..54e79e78c31 100644
--- a/qa/suites/upgrade/octopus-x/stress-split/1-start.yaml
+++ b/qa/suites/upgrade/octopus-x/stress-split/1-start.yaml
@@ -1,3 +1,11 @@
+overrides:
+  ceph:
+    log-ignorelist:
+      - mons down
+      - mon down
+      - MON_DOWN
+      - out of quorum
+      - PG_AVAILABILITY
 tasks:
 - install:
     branch: octopus
diff --git a/qa/suites/upgrade/pacific-x/parallel/1-tasks.yaml b/qa/suites/upgrade/pacific-x/parallel/1-tasks.yaml
index 8d27ad451e8..3ca7769c0e6 100644
--- a/qa/suites/upgrade/pacific-x/parallel/1-tasks.yaml
+++ b/qa/suites/upgrade/pacific-x/parallel/1-tasks.yaml
@@ -5,6 +5,7 @@ overrides:
       - mon down
       - MON_DOWN
       - out of quorum
+      - PG_AVAILABILITY
 tasks:
 - install:
     branch: pacific
diff --git a/qa/suites/upgrade/pacific-x/stress-split/1-start.yaml b/qa/suites/upgrade/pacific-x/stress-split/1-start.yaml
index 9a552df9991..1a5246cea54 100644
--- a/qa/suites/upgrade/pacific-x/stress-split/1-start.yaml
+++ b/qa/suites/upgrade/pacific-x/stress-split/1-start.yaml
@@ -1,3 +1,11 @@
+overrides:
+  ceph:
+    log-ignorelist:
+      - mons down
+      - mon down
+      - MON_DOWN
+      - out of quorum
+      - PG_AVAILABILITY
 tasks:
 - install:
     branch: pacific