Merge pull request #14788 from liewegas/wip-jewel-x-rgw

qa/suites/jewel-x/point-to-point: don't scane for keys on second s3tests either

Reviewed-by: Josh Durgin <jdurgin@redhat.com>

qa/suites/upgrade/jewel-x/parallel/2-workload/blogbench.yaml

@@ -4,11 +4,11 @@ meta:
    mount ceph-fuse on client.2 before running workunit
 workload:
   full_sequential:
-  - sequential:
-    - ceph-fuse:
-    - print: "**** done ceph-fuse 2-workload"
-    - workunit:
-        clients:
-           client.2:
-            - suites/blogbench.sh
-    - print: "**** done suites/blogbench.sh 2-workload"
+    - sequential:
+      - ceph-fuse:
+      - print: "**** done ceph-fuse 2-workload"
+      - workunit:
+          clients:
+             client.2:
+              - suites/blogbench.sh
+      - print: "**** done suites/blogbench.sh 2-workload"

qa/suites/upgrade/jewel-x/parallel/2-workload/ec-rados-default.yaml

@@ -4,21 +4,21 @@ meta:
    on an erasure-coded pool
 workload:
   full_sequential:
-  - rados:
-      clients: [client.0]
-      ops: 4000
-      objects: 50
-      ec_pool: true
-      write_append_excl: false
-      op_weights:
-        read: 100
-        write: 0
-        append: 100
-        delete: 50
-        snap_create: 50
-        snap_remove: 50
-        rollback: 50
-        copy_from: 50
-        setattr: 25
-        rmattr: 25
-  - print: "**** done rados ec task"
+    - rados:
+        clients: [client.0]
+        ops: 4000
+        objects: 50
+        ec_pool: true
+        write_append_excl: false
+        op_weights:
+          read: 100
+          write: 0
+          append: 100
+          delete: 50
+          snap_create: 50
+          snap_remove: 50
+          rollback: 50
+          copy_from: 50
+          setattr: 25
+          rmattr: 25
+    - print: "**** done rados ec task"

qa/suites/upgrade/jewel-x/point-to-point-x/point-to-point-upgrade.yaml

@@ -172,6 +172,7 @@ workload_x:
        client.1:
          force-branch: ceph-jewel
          rgw_server: client.1
+         scan_for_encryption_keys: false
    - print: "**** done s3tests workload_x"
 upgrade-sequence_x:
    sequential: