import ceph quincy 17.2.4

[ceph.git] / ceph / qa / tasks / s3tests.py

diff --git a/ceph/qa/tasks/s3tests.py b/ceph/qa/tasks/s3tests.py
index bd844c6c1a78da2d40e003327655202ce73b30e5..4ee388f5db2e600d3612fffca2f82fea23df08ce 100644 (file)
--- a/ceph/qa/tasks/s3tests.py
+++ b/ceph/qa/tasks/s3tests.py
@@ -416,6 +416,7 @@ def run_tests(ctx, config):
     testdir = teuthology.get_testdir(ctx)
     for client, client_config in config.items():
         client_config = client_config or {}
+        (cluster_name,_,_) = teuthology.split_role(client)
         (remote,) = ctx.cluster.only(client).remotes.keys()
         args = [
             'S3TEST_CONF={tdir}/archive/s3-tests.{client}.conf'.format(tdir=testdir, client=client),
@@ -432,6 +433,12 @@ 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 not client_config.get('with-sse-s3'):
+            attrs += ['!sse-s3']
+        elif client_config.get('with-sse-s3'):
+            pass
+        elif ctx.ceph[cluster_name].rgw_crypt_sse_s3_backend is None:
+            attrs += ['!sse-s3']
        
         if 'extra_attrs' in client_config:
             attrs = client_config.get('extra_attrs')