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 c9005ae00694c68368ce60ccbc35a10883f5df24..07a08b9a6b9dc2be1c7a7d1fc18d137880b19f5d 100644 (file)
--- 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 (symlink)
index 0000000..9889fd2
--- /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 (file)
index 0000000..ad1d5d8
--- /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 (symlink)
index 0000000..9889fd2
--- /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 (symlink)
index 0000000..9889fd2
--- /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 b5196ca82a49077f8abab6325421371aab6fd63d..c9019e15499c10ce0b0d3cb654b169e5c275068a 100644 (file)
--- 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 (symlink)
index 0000000..9889fd2
--- /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 (symlink)
index 0000000..9889fd2
--- /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 070c88d705ccf77851964e20a14bf765fdf3f878..d9c86bf93d4691f36a35b0ea563baf6b72bb1c93 100644 (file)
--- 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: