From a4fc5c38e5682d9adba12fac5abedcdd85fa4b36 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Thu, 20 Apr 2017 14:49:04 -0400 Subject: [PATCH] qa/rgw: don't scan radosgw logs for encryption keys on jewel upgrade test Signed-off-by: Casey Bodley --- .../jewel-x/point-to-point-x/point-to-point-upgrade.yaml | 1 + qa/tasks/s3tests.py | 2 ++ 2 files changed, 3 insertions(+) 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 19abc9b628ecd..232615850760a 100644 --- 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 7d3df2bb9c647..4fbea2f64c8eb 100644 --- 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=[ -- 2.39.5