From 438cb17c4a4e6309c375791125b81e4985390755 Mon Sep 17 00:00:00 2001
From: Venky Shankar <vshankar@redhat.com>
Date: Tue, 12 Sep 2023 15:51:05 +0530
Subject: [PATCH] qa: use exisitng ignorelist override list for fs:mirror[-ha]

The custom ignorelist yaml would also require `POOL_APP_NOT_ENABLED`
to be ignored. The custom yaml is unnecessary anyway.

Fixes: http://tracker.ceph.com/issues/62482
Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit a728d170cc8e610c7dbb952197303de7b083c650)
---
 .../fs/mirror-ha/overrides/ignorelist_health.yaml  |  1 +
 .../fs/mirror-ha/overrides/whitelist_health.yaml   | 14 --------------
 .../fs/mirror/overrides/ignorelist_health.yaml     |  1 +
 .../fs/mirror/overrides/whitelist_health.yaml      | 14 --------------
 .../mirror/overrides/ignorelist_health.yaml        |  1 +
 .../mirror/overrides/whitelist_health.yaml         | 14 --------------
 6 files changed, 3 insertions(+), 42 deletions(-)
 create mode 120000 qa/suites/fs/mirror-ha/overrides/ignorelist_health.yaml
 delete mode 100644 qa/suites/fs/mirror-ha/overrides/whitelist_health.yaml
 create mode 120000 qa/suites/fs/mirror/overrides/ignorelist_health.yaml
 delete mode 100644 qa/suites/fs/mirror/overrides/whitelist_health.yaml
 create mode 120000 qa/suites/fs/valgrind/mirror/overrides/ignorelist_health.yaml
 delete mode 100644 qa/suites/fs/valgrind/mirror/overrides/whitelist_health.yaml

diff --git a/qa/suites/fs/mirror-ha/overrides/ignorelist_health.yaml b/qa/suites/fs/mirror-ha/overrides/ignorelist_health.yaml
new file mode 120000
index 000000000000..4cb7d981d9d4
--- /dev/null
+++ b/qa/suites/fs/mirror-ha/overrides/ignorelist_health.yaml
@@ -0,0 +1 @@
+./.qa/cephfs/overrides/ignorelist_health.yaml
\ No newline at end of file
diff --git a/qa/suites/fs/mirror-ha/overrides/whitelist_health.yaml b/qa/suites/fs/mirror-ha/overrides/whitelist_health.yaml
deleted file mode 100644
index d40fa4cb82ce..000000000000
--- a/qa/suites/fs/mirror-ha/overrides/whitelist_health.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-overrides:
-  ceph:
-    log-ignorelist:
-      - overall HEALTH_
-      - \(FS_DEGRADED\)
-      - \(MDS_FAILED\)
-      - \(MDS_DEGRADED\)
-      - \(FS_WITH_FAILED_MDS\)
-      - \(MDS_DAMAGE\)
-      - \(MDS_ALL_DOWN\)
-      - \(MDS_UP_LESS_THAN_MAX\)
-      - \(FS_INLINE_DATA_DEPRECATED\)
-      - Reduced data availability
-      - Degraded data redundancy
diff --git a/qa/suites/fs/mirror/overrides/ignorelist_health.yaml b/qa/suites/fs/mirror/overrides/ignorelist_health.yaml
new file mode 120000
index 000000000000..4cb7d981d9d4
--- /dev/null
+++ b/qa/suites/fs/mirror/overrides/ignorelist_health.yaml
@@ -0,0 +1 @@
+./.qa/cephfs/overrides/ignorelist_health.yaml
\ No newline at end of file
diff --git a/qa/suites/fs/mirror/overrides/whitelist_health.yaml b/qa/suites/fs/mirror/overrides/whitelist_health.yaml
deleted file mode 100644
index d40fa4cb82ce..000000000000
--- a/qa/suites/fs/mirror/overrides/whitelist_health.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-overrides:
-  ceph:
-    log-ignorelist:
-      - overall HEALTH_
-      - \(FS_DEGRADED\)
-      - \(MDS_FAILED\)
-      - \(MDS_DEGRADED\)
-      - \(FS_WITH_FAILED_MDS\)
-      - \(MDS_DAMAGE\)
-      - \(MDS_ALL_DOWN\)
-      - \(MDS_UP_LESS_THAN_MAX\)
-      - \(FS_INLINE_DATA_DEPRECATED\)
-      - Reduced data availability
-      - Degraded data redundancy
diff --git a/qa/suites/fs/valgrind/mirror/overrides/ignorelist_health.yaml b/qa/suites/fs/valgrind/mirror/overrides/ignorelist_health.yaml
new file mode 120000
index 000000000000..4cb7d981d9d4
--- /dev/null
+++ b/qa/suites/fs/valgrind/mirror/overrides/ignorelist_health.yaml
@@ -0,0 +1 @@
+./.qa/cephfs/overrides/ignorelist_health.yaml
\ No newline at end of file
diff --git a/qa/suites/fs/valgrind/mirror/overrides/whitelist_health.yaml b/qa/suites/fs/valgrind/mirror/overrides/whitelist_health.yaml
deleted file mode 100644
index d40fa4cb82ce..000000000000
--- a/qa/suites/fs/valgrind/mirror/overrides/whitelist_health.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-overrides:
-  ceph:
-    log-ignorelist:
-      - overall HEALTH_
-      - \(FS_DEGRADED\)
-      - \(MDS_FAILED\)
-      - \(MDS_DEGRADED\)
-      - \(FS_WITH_FAILED_MDS\)
-      - \(MDS_DAMAGE\)
-      - \(MDS_ALL_DOWN\)
-      - \(MDS_UP_LESS_THAN_MAX\)
-      - \(FS_INLINE_DATA_DEPRECATED\)
-      - Reduced data availability
-      - Degraded data redundancy
-- 
2.47.3