qa/rgw: don't scan radosgw logs for encryption keys on jewel upgrade test

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

diff --git a/qa/suites/upgrade/jewel-x/point-to-point-x/point-to-point-upgrade.yaml b/qa/suites/upgrade/jewel-x/point-to-point-x/point-to-point-upgrade.yaml
index 19abc9b628ecd98b85eaca0084eae0460add2c9d..232615850760a5795ee6eab6c69b94e90f89b293 100644 (file)
--- a/qa/suites/upgrade/jewel-x/point-to-point-x/point-to-point-upgrade.yaml
+++ b/qa/suites/upgrade/jewel-x/point-to-point-x/point-to-point-upgrade.yaml
@@ -112,6 +112,7 @@ workload_jewel:
          client.0:
            force-branch: ceph-jewel
            rgw_server: client.0
+           scan_for_encryption_keys: false
      - print: "**** done s3tests workload_jewel"
 upgrade-sequence_jewel:
    sequential:

diff --git a/qa/tasks/s3tests.py b/qa/tasks/s3tests.py
index 7d3df2bb9c647f20005711771e24a0da8af3b859..4fbea2f64c8eb40ffd3827a736ebcbd7c7560417 100644 (file)
--- a/qa/tasks/s3tests.py
+++ b/qa/tasks/s3tests.py
@@ -379,6 +379,8 @@ def scan_for_leaked_encryption_keys(ctx, config):
         log.debug('Scanning radosgw logs for leaked encryption keys...')
         procs = list()
         for client, client_config in config.iteritems():
+            if not client_config.get('scan_for_encryption_keys', True):
+                continue
             (remote,) = ctx.cluster.only(client).remotes.keys()
             proc = remote.run(
                 args=[