From: Casey Bodley <cbodley@redhat.com>
Date: Mon, 5 Apr 2021 17:09:50 +0000 (-0400)
Subject: qa/rgw: move ignore-pg-availability.yaml out of suites/rgw
X-Git-Tag: v17.1.0~2335^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F40601%2Fhead;p=ceph.git

qa/rgw: move ignore-pg-availability.yaml out of suites/rgw

this was added in https://github.com/ceph/ceph/pull/39820 to
avoid repeating the override in rgw subsuites, but teuthology
was picking up suites/rgw/ignore-pg-availability.yaml as a job
of its own, and led to 'list index out of range' failures

Fixes: https://tracker.ceph.com/issues/50147

Signed-off-by: Casey Bodley <cbodley@redhat.com>
---

diff --git a/qa/rgw/ignore-pg-availability.yaml b/qa/rgw/ignore-pg-availability.yaml
new file mode 100644
index 000000000000..ad1d5d8a0636
--- /dev/null
+++ b/qa/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/crypt/ignore-pg-availability.yaml b/qa/suites/rgw/crypt/ignore-pg-availability.yaml
index 9889fd2d2dec..32340b1fa8be 120000
--- a/qa/suites/rgw/crypt/ignore-pg-availability.yaml
+++ b/qa/suites/rgw/crypt/ignore-pg-availability.yaml
@@ -1 +1 @@
-../ignore-pg-availability.yaml
\ No newline at end of file
+.qa/rgw/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
deleted file mode 100644
index ad1d5d8a0636..000000000000
--- a/qa/suites/rgw/ignore-pg-availability.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-# 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
index 9889fd2d2dec..32340b1fa8be 120000
--- a/qa/suites/rgw/multifs/ignore-pg-availability.yaml
+++ b/qa/suites/rgw/multifs/ignore-pg-availability.yaml
@@ -1 +1 @@
-../ignore-pg-availability.yaml
\ No newline at end of file
+.qa/rgw/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
index 9889fd2d2dec..32340b1fa8be 120000
--- a/qa/suites/rgw/multisite/ignore-pg-availability.yaml
+++ b/qa/suites/rgw/multisite/ignore-pg-availability.yaml
@@ -1 +1 @@
-../ignore-pg-availability.yaml
\ No newline at end of file
+.qa/rgw/ignore-pg-availability.yaml
\ No newline at end of file
diff --git a/qa/suites/rgw/sts/.qa b/qa/suites/rgw/sts/.qa
new file mode 120000
index 000000000000..fea2489fdf6d
--- /dev/null
+++ b/qa/suites/rgw/sts/.qa
@@ -0,0 +1 @@
+../.qa
\ No newline at end of file
diff --git a/qa/suites/rgw/sts/ignore-pg-availability.yaml b/qa/suites/rgw/sts/ignore-pg-availability.yaml
index 9889fd2d2dec..32340b1fa8be 120000
--- a/qa/suites/rgw/sts/ignore-pg-availability.yaml
+++ b/qa/suites/rgw/sts/ignore-pg-availability.yaml
@@ -1 +1 @@
-../ignore-pg-availability.yaml
\ No newline at end of file
+.qa/rgw/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
index 9889fd2d2dec..32340b1fa8be 120000
--- a/qa/suites/rgw/verify/ignore-pg-availability.yaml
+++ b/qa/suites/rgw/verify/ignore-pg-availability.yaml
@@ -1 +1 @@
-../ignore-pg-availability.yaml
\ No newline at end of file
+.qa/rgw/ignore-pg-availability.yaml
\ No newline at end of file