From: Casey Bodley <cbodley@redhat.com>
Date: Wed, 11 May 2022 18:45:16 +0000 (-0400)
Subject: Revert "qa/rgw - run sse-s3 test cases only if configured or requested"
X-Git-Tag: v18.0.0~861^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=864f457a84296a6ae0e1b936fd4b3ff5095ad53c;p=ceph-ci.git

Revert "qa/rgw - run sse-s3 test cases only if configured or requested"

This reverts commit 9235cf95c1ef976af6d5a1aa7919b135066d7208.

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

diff --git a/qa/tasks/ceph_manager.py b/qa/tasks/ceph_manager.py
index 8768a40e4f2..51d802cd7ce 100644
--- a/qa/tasks/ceph_manager.py
+++ b/qa/tasks/ceph_manager.py
@@ -14,7 +14,6 @@ import logging
 import threading
 import traceback
 import os
-import re
 import shlex
 
 from io import BytesIO, StringIO
@@ -71,14 +70,6 @@ def write_conf(ctx, conf_path=DEFAULT_CONF_PATH, cluster='ceph'):
     conf_fp = BytesIO()
     ctx.ceph[cluster].conf.write(conf_fp)
     conf_fp.seek(0)
-    lines = conf_fp.readlines()
-    m = None
-    for l in lines:
-     m = re.search("rgw.crypt.sse.s3.backend *= *(.*)", l.decode())
-     if m:
-      break
-    ctx.ceph[cluster].rgw_crypt_sse_s3_backend = m.expand("\\1") if m else None
-    conf_fp.seek(0)
     writes = ctx.cluster.run(
         args=[
             'sudo', 'mkdir', '-p', '/etc/ceph', run.Raw('&&'),
diff --git a/qa/tasks/s3tests.py b/qa/tasks/s3tests.py
index a92b7377287..e5238563f4e 100644
--- a/qa/tasks/s3tests.py
+++ b/qa/tasks/s3tests.py
@@ -416,7 +416,6 @@ 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),
@@ -435,10 +434,6 @@ def run_tests(ctx, config):
             attrs += ['!fails_with_subdomain']
         if client_config.get('without-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')