From 0813c1ab5de3cf6538842965a5d40792ac35b321 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Tue, 29 Mar 2022 13:02:10 -0400 Subject: [PATCH] qa/rgw: reenable wait-for-scrub Signed-off-by: Casey Bodley --- qa/suites/rgw/crypt/1-ceph-install/install.yaml | 4 ---- qa/suites/rgw/lifecycle/overrides.yaml | 1 - qa/suites/rgw/multifs/overrides.yaml | 1 - qa/suites/rgw/multisite/overrides.yaml | 1 - qa/suites/rgw/notifications/overrides.yaml | 1 - qa/suites/rgw/singleton/overrides.yaml | 1 - qa/suites/rgw/sts/overrides.yaml | 1 - qa/suites/rgw/upgrade/overrides.yaml | 1 - 8 files changed, 11 deletions(-) diff --git a/qa/suites/rgw/crypt/1-ceph-install/install.yaml b/qa/suites/rgw/crypt/1-ceph-install/install.yaml index 07a08b9a6b9dc..2030acb90836c 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 83722d31252e1..9557da444fbb7 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 1cb489072f905..de10692b94162 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 76c14eb911cc9..a1559e1fe1aa0 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 1cb489072f905..de10692b94162 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 d2aea790aecf9..e7a292ffd1fd9 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 1cb489072f905..de10692b94162 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 00592d4594776..8284d8a57fe3d 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 -- 2.39.5