From: Casey Bodley <cbodley@redhat.com>
Date: Thu, 29 Jun 2023 14:40:16 +0000 (-0400)
Subject: qa/s3tests: use cloudtier_tests and lifecycle_tests to control filters
X-Git-Tag: v19.0.0~437^2~2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=c7f2bc42d906891eac702fa85df5b57341fdd7af;p=ceph.git

qa/s3tests: use cloudtier_tests and lifecycle_tests to control filters

when `extra_attrs` was made additive, these tests were adding both
'not lifecycle_expiration' and 'lifecycle_expiration' to the command
line. use a yaml flag instead to control whether or not the s3tests task
adds the 'not' filter

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

diff --git a/qa/suites/rgw/cloud-transition/tasks/cloud_transition_s3tests.yaml b/qa/suites/rgw/cloud-transition/tasks/cloud_transition_s3tests.yaml
index caead6ea2dcb3..39023173fcefa 100644
--- a/qa/suites/rgw/cloud-transition/tasks/cloud_transition_s3tests.yaml
+++ b/qa/suites/rgw/cloud-transition/tasks/cloud_transition_s3tests.yaml
@@ -52,6 +52,7 @@ tasks:
       storage classes: LUKEWARM, FROZEN
       extra_attrs: ["cloud_transition"]
       lc_debug_interval: 10
+      lifecycle_tests: True
       cloudtier_tests: True
     #client.2:
       #force-branch: ceph-master
diff --git a/qa/suites/rgw/lifecycle/tasks/rgw_s3tests.yaml b/qa/suites/rgw/lifecycle/tasks/rgw_s3tests.yaml
index d027af29ccb0d..6e95e2fac7a63 100644
--- a/qa/suites/rgw/lifecycle/tasks/rgw_s3tests.yaml
+++ b/qa/suites/rgw/lifecycle/tasks/rgw_s3tests.yaml
@@ -7,5 +7,5 @@ tasks:
     client.0:
       rgw_server: client.0
       storage classes: LUKEWARM, FROZEN
-      extra_attrs: ["lifecycle"]
       lc_debug_interval: 10
+      lifecycle_tests: True
diff --git a/qa/tasks/s3tests.py b/qa/tasks/s3tests.py
index 52a1e41384478..70b49c086b6f8 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"]
+        attrs = ["not fails_on_rgw"]
+        if not client_config.get('lifecycle_tests'):
+            attrs += ['not lifecycle_expiration', 'not lifecycle_transition']
+        if not client_config.get('cloudtier_tests'):
+            attrs += ['not cloud_transition']
         if not client_config.get('sts_tests', False):
             attrs += ["not test_of_sts"]
         if not client_config.get('webidentity_tests', False):