From 1c006c92e1bec88f97fdfeb546052101705e729b Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Thu, 22 Jun 2023 08:47:06 -0400 Subject: [PATCH] qa/s3tests: make extra_attrs additive the s3tests.py task is filtering out several attrs by default. but when dbstore uses `extra_attrs` to add 'not fails_on_dbstore', it overwrites those other filters Signed-off-by: Casey Bodley --- qa/suites/rgw/dbstore/tasks/rgw_s3tests.yaml | 3 +-- qa/tasks/s3tests.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/qa/suites/rgw/dbstore/tasks/rgw_s3tests.yaml b/qa/suites/rgw/dbstore/tasks/rgw_s3tests.yaml index daab5581df83b..69ff8108179b6 100644 --- a/qa/suites/rgw/dbstore/tasks/rgw_s3tests.yaml +++ b/qa/suites/rgw/dbstore/tasks/rgw_s3tests.yaml @@ -12,5 +12,4 @@ tasks: client.0: dbstore_tests: True rgw_server: client.0 - extra_attrs: ["not fails_on_rgw","not fails_on_dbstore"] - + extra_attrs: ["not fails_on_dbstore"] diff --git a/qa/tasks/s3tests.py b/qa/tasks/s3tests.py index 3856f8fadcd4f..8c019fd76a221 100644 --- a/qa/tasks/s3tests.py +++ b/qa/tasks/s3tests.py @@ -385,7 +385,7 @@ def run_tests(ctx, config): attrs += ['not sse_s3'] if 'extra_attrs' in client_config: - attrs = client_config.get('extra_attrs') + attrs += client_config.get('extra_attrs') args += ['tox', '--', '-v', '-m', ' and '.join(attrs)] if 'extra_args' in client_config: args.append(client_config['extra_args']) -- 2.39.5