From: Casey Bodley <cbodley@redhat.com>
Date: Tue, 27 Jun 2023 20:45:06 +0000 (-0400)
Subject: qa/s3tests: filter on 'sts_tests' and 'webidentity_tests'
X-Git-Tag: v19.0.0~934^2~2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=09e10793e10ccce974eef8a0cdc8719a78487402;p=ceph.git

qa/s3tests: filter on 'sts_tests' and 'webidentity_tests'

qa/tasks/s3tests.py was adding `not test_of_sts` and `not
webidentity_test` by default, and the rgw/sts suites were adding
those attrs back in `extra_attrs`

when `extra_attrs` was changed to be additive, this started causing
InvocationError failures

instead of using `extra_attrs` to control these filters,
qa/tasks/s3tests.py now uses the `sts_tests` and `webidentity_tests`
flags from the sts yaml files to control whether or not the `not
test_of_sts`/`not webidentity_test` attrs are added to the pytest
command line

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

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

diff --git a/qa/suites/rgw/sts/tasks/first.yaml b/qa/suites/rgw/sts/tasks/first.yaml
index db785ba73febe..2b961baa64b86 100644
--- a/qa/suites/rgw/sts/tasks/first.yaml
+++ b/qa/suites/rgw/sts/tasks/first.yaml
@@ -6,8 +6,8 @@ tasks:
 - s3tests:
     client.0:
       sts_tests: True
+      webidentity_tests: True
       rgw_server: client.0
-      extra_attrs: ['webidentity_test']
 overrides:
   ceph:
     conf:
diff --git a/qa/suites/rgw/sts/tasks/ststests.yaml b/qa/suites/rgw/sts/tasks/ststests.yaml
index 175071b892f77..1e3e9098991b6 100644
--- a/qa/suites/rgw/sts/tasks/ststests.yaml
+++ b/qa/suites/rgw/sts/tasks/ststests.yaml
@@ -2,7 +2,6 @@ tasks:
 - s3tests:
     client.0:
       sts_tests: True
-      extra_attrs: ["test_of_sts"]
       rgw_server: client.0
 overrides:
   ceph:
diff --git a/qa/tasks/s3tests.py b/qa/tasks/s3tests.py
index 7959627be478f..52a1e41384478 100644
--- a/qa/tasks/s3tests.py
+++ b/qa/tasks/s3tests.py
@@ -377,7 +377,11 @@ def run_tests(ctx, config):
             args += ['REQUESTS_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt']
         else:
             args += ['REQUESTS_CA_BUNDLE=/etc/pki/tls/certs/ca-bundle.crt']
-        attrs = ["not fails_on_rgw", "not lifecycle_expiration", "not test_of_sts", "not webidentity_test"]
+        attrs = ["not fails_on_rgw", "not lifecycle_expiration"]
+        if not client_config.get('sts_tests', False):
+            attrs += ["not test_of_sts"]
+        if not client_config.get('webidentity_tests', False):
+            attrs += ["not webidentity_test"]
         if client_config.get('calling-format') != 'ordinary':
             attrs += ['not fails_with_subdomain']
         if not client_config.get('with-sse-s3'):