From: Casey Bodley Date: Wed, 11 May 2022 18:49:49 +0000 (-0400) Subject: qa/rgw: use 'with-sse-s3' override for s3tests X-Git-Tag: v17.2.6~21^2~90^2 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=aa7704b54c51c609cf11f00cd745d9c5947f5576;p=ceph.git qa/rgw: use 'with-sse-s3' override for s3tests don't rely on the ceph manager task to parse a config file. each rgw could be using a different config. instead, revert to an s3tests override called 'with-sse-s3' this way, the only job that enables sse-s3, vault_transit.yaml, contains both the 'rgw crypt sse s3' configurables, and the flag to enable the associated test cases Signed-off-by: Casey Bodley (cherry picked from commit 98ddd40859e5de6cde6386e1d3dad488f2dc54be) --- diff --git a/qa/suites/rgw/crypt/2-kms/vault_transit.yaml b/qa/suites/rgw/crypt/2-kms/vault_transit.yaml index 4e6d270251537..d20bb52bcbfb3 100644 --- a/qa/suites/rgw/crypt/2-kms/vault_transit.yaml +++ b/qa/suites/rgw/crypt/2-kms/vault_transit.yaml @@ -13,6 +13,8 @@ overrides: rgw: client.0: use-vault-role: client.0 + s3tests: + with-sse-s3: true tasks: - vault: diff --git a/qa/tasks/s3tests.py b/qa/tasks/s3tests.py index a92b737728762..4ee388f5db2e6 100644 --- a/qa/tasks/s3tests.py +++ b/qa/tasks/s3tests.py @@ -433,7 +433,7 @@ def run_tests(ctx, config): attrs = ["!fails_on_rgw", "!lifecycle_expiration", "!fails_strict_rfc2616","!test_of_sts","!webidentity_test"] if client_config.get('calling-format') != 'ordinary': attrs += ['!fails_with_subdomain'] - if client_config.get('without-sse-s3'): + if not client_config.get('with-sse-s3'): attrs += ['!sse-s3'] elif client_config.get('with-sse-s3'): pass