From: Casey Bodley <cbodley@redhat.com>
Date: Tue, 29 Mar 2022 17:02:10 +0000 (-0400)
Subject: qa/rgw: reenable wait-for-scrub
X-Git-Tag: v19.0.0~1484^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F45693%2Fhead;p=ceph.git

qa/rgw: reenable wait-for-scrub

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

diff --git a/qa/suites/rgw/crypt/1-ceph-install/install.yaml b/qa/suites/rgw/crypt/1-ceph-install/install.yaml
index 07a08b9a6b9d..2030acb90836 100644
--- a/qa/suites/rgw/crypt/1-ceph-install/install.yaml
+++ b/qa/suites/rgw/crypt/1-ceph-install/install.yaml
@@ -1,7 +1,3 @@
-overrides:
-  ceph:
-    wait-for-scrub: false
-
 tasks:
 - install:
 - ceph:
diff --git a/qa/suites/rgw/lifecycle/overrides.yaml b/qa/suites/rgw/lifecycle/overrides.yaml
index 83722d31252e..9557da444fbb 100644
--- a/qa/suites/rgw/lifecycle/overrides.yaml
+++ b/qa/suites/rgw/lifecycle/overrides.yaml
@@ -1,6 +1,5 @@
 overrides:
   ceph:
-    wait-for-scrub: false
     conf:
       client:
         setuser: ceph
diff --git a/qa/suites/rgw/multifs/overrides.yaml b/qa/suites/rgw/multifs/overrides.yaml
index 1cb489072f90..de10692b9416 100644
--- a/qa/suites/rgw/multifs/overrides.yaml
+++ b/qa/suites/rgw/multifs/overrides.yaml
@@ -1,6 +1,5 @@
 overrides:
   ceph:
-    wait-for-scrub: false
     conf:
       client:
         setuser: ceph
diff --git a/qa/suites/rgw/multisite/overrides.yaml b/qa/suites/rgw/multisite/overrides.yaml
index 76c14eb911cc..a1559e1fe1aa 100644
--- a/qa/suites/rgw/multisite/overrides.yaml
+++ b/qa/suites/rgw/multisite/overrides.yaml
@@ -1,6 +1,5 @@
 overrides:
   ceph:
-    wait-for-scrub: false
     conf:
       client:
         setuser: ceph
diff --git a/qa/suites/rgw/notifications/overrides.yaml b/qa/suites/rgw/notifications/overrides.yaml
index 1cb489072f90..de10692b9416 100644
--- a/qa/suites/rgw/notifications/overrides.yaml
+++ b/qa/suites/rgw/notifications/overrides.yaml
@@ -1,6 +1,5 @@
 overrides:
   ceph:
-    wait-for-scrub: false
     conf:
       client:
         setuser: ceph
diff --git a/qa/suites/rgw/singleton/overrides.yaml b/qa/suites/rgw/singleton/overrides.yaml
index d2aea790aecf..e7a292ffd1fd 100644
--- a/qa/suites/rgw/singleton/overrides.yaml
+++ b/qa/suites/rgw/singleton/overrides.yaml
@@ -1,6 +1,5 @@
 overrides:
   ceph:
-    wait-for-scrub: false
     conf:
       client:
         setuser: ceph
diff --git a/qa/suites/rgw/sts/overrides.yaml b/qa/suites/rgw/sts/overrides.yaml
index 1cb489072f90..de10692b9416 100644
--- a/qa/suites/rgw/sts/overrides.yaml
+++ b/qa/suites/rgw/sts/overrides.yaml
@@ -1,6 +1,5 @@
 overrides:
   ceph:
-    wait-for-scrub: false
     conf:
       client:
         setuser: ceph
diff --git a/qa/suites/rgw/upgrade/overrides.yaml b/qa/suites/rgw/upgrade/overrides.yaml
index 00592d459477..8284d8a57fe3 100644
--- a/qa/suites/rgw/upgrade/overrides.yaml
+++ b/qa/suites/rgw/upgrade/overrides.yaml
@@ -9,7 +9,6 @@ overrides:
       - \(PG_DEGRADED\)
       - slow request
       - failed to encode map
-    wait-for-scrub: false
     conf:
       mon:
         mon warn on osd down out interval zero: false