From: Casey Bodley <cbodley@redhat.com>
Date: Wed, 3 Mar 2021 16:20:57 +0000 (-0500)
Subject: qa/rgw: put PG_AVAILABILITY ignorelist override in its own file
X-Git-Tag: v16.2.0~104^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=43d509f576787f9f71e8eb4f77509892e4299c6f;p=ceph.git

qa/rgw: put PG_AVAILABILITY ignorelist override in its own file

now covers the sts and multifs subsuites

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 4fe1b138ff3f8f832e01a95f7038260b4e853f4b)
---

diff --git a/qa/suites/rgw/crypt/1-ceph-install/install.yaml b/qa/suites/rgw/crypt/1-ceph-install/install.yaml
index c9005ae0069..07a08b9a6b9 100644
--- a/qa/suites/rgw/crypt/1-ceph-install/install.yaml
+++ b/qa/suites/rgw/crypt/1-ceph-install/install.yaml
@@ -1,7 +1,5 @@
 overrides:
   ceph:
-    log-ignorelist:
-    - \(PG_AVAILABILITY\)
     wait-for-scrub: false
 
 tasks:
diff --git a/qa/suites/rgw/crypt/ignore-pg-availability.yaml b/qa/suites/rgw/crypt/ignore-pg-availability.yaml
new file mode 120000
index 00000000000..9889fd2d2de
--- /dev/null
+++ b/qa/suites/rgw/crypt/ignore-pg-availability.yaml
@@ -0,0 +1 @@
+../ignore-pg-availability.yaml
\ No newline at end of file
diff --git a/qa/suites/rgw/ignore-pg-availability.yaml b/qa/suites/rgw/ignore-pg-availability.yaml
new file mode 100644
index 00000000000..ad1d5d8a063
--- /dev/null
+++ b/qa/suites/rgw/ignore-pg-availability.yaml
@@ -0,0 +1,5 @@
+# https://tracker.ceph.com/issues/45802
+overrides:
+  ceph:
+    log-ignorelist:
+    - \(PG_AVAILABILITY\)
diff --git a/qa/suites/rgw/multifs/ignore-pg-availability.yaml b/qa/suites/rgw/multifs/ignore-pg-availability.yaml
new file mode 120000
index 00000000000..9889fd2d2de
--- /dev/null
+++ b/qa/suites/rgw/multifs/ignore-pg-availability.yaml
@@ -0,0 +1 @@
+../ignore-pg-availability.yaml
\ No newline at end of file
diff --git a/qa/suites/rgw/multisite/ignore-pg-availability.yaml b/qa/suites/rgw/multisite/ignore-pg-availability.yaml
new file mode 120000
index 00000000000..9889fd2d2de
--- /dev/null
+++ b/qa/suites/rgw/multisite/ignore-pg-availability.yaml
@@ -0,0 +1 @@
+../ignore-pg-availability.yaml
\ No newline at end of file
diff --git a/qa/suites/rgw/multisite/overrides.yaml b/qa/suites/rgw/multisite/overrides.yaml
index b5196ca82a4..c9019e15499 100644
--- a/qa/suites/rgw/multisite/overrides.yaml
+++ b/qa/suites/rgw/multisite/overrides.yaml
@@ -1,7 +1,5 @@
 overrides:
   ceph:
-    log-ignorelist:
-    - \(PG_AVAILABILITY\)
     wait-for-scrub: false
     conf:
       client:
diff --git a/qa/suites/rgw/sts/ignore-pg-availability.yaml b/qa/suites/rgw/sts/ignore-pg-availability.yaml
new file mode 120000
index 00000000000..9889fd2d2de
--- /dev/null
+++ b/qa/suites/rgw/sts/ignore-pg-availability.yaml
@@ -0,0 +1 @@
+../ignore-pg-availability.yaml
\ No newline at end of file
diff --git a/qa/suites/rgw/verify/ignore-pg-availability.yaml b/qa/suites/rgw/verify/ignore-pg-availability.yaml
new file mode 120000
index 00000000000..9889fd2d2de
--- /dev/null
+++ b/qa/suites/rgw/verify/ignore-pg-availability.yaml
@@ -0,0 +1 @@
+../ignore-pg-availability.yaml
\ No newline at end of file
diff --git a/qa/suites/rgw/verify/tasks/cls.yaml b/qa/suites/rgw/verify/tasks/cls.yaml
index 070c88d705c..d9c86bf93d4 100644
--- a/qa/suites/rgw/verify/tasks/cls.yaml
+++ b/qa/suites/rgw/verify/tasks/cls.yaml
@@ -1,7 +1,3 @@
-overrides:
-  ceph:
-    log-ignorelist:
-    - \(PG_AVAILABILITY\)
 tasks:
 - workunit:
     clients: