Merge pull request #606 from viduship/vim-cephqe

Automate IBM cloud transition with compression and encryption and tfa fixes.
red-hat-storage · Jun 27, 2024 · c3538cc · c3538cc
2 parents 7bb5533 + c7843e5
commit c3538cc
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 3 deletions.
diff --git a/rgw/v2/tests/s3_swift/multisite_configs/test_lc_cloud_transition_ibm_retain_false.yaml b/rgw/v2/tests/s3_swift/multisite_configs/test_lc_cloud_transition_ibm_retain_false.yaml
@@ -1,5 +1,5 @@
 #test_bucket_lifecycle_object_expiration_transition.py
-#CEPH-83581973,CEPH-83581975
+#CEPH-83581973,CEPH-83581975, CEPH-83581977
 config:
   user_count: 1
   bucket_count: 1

diff --git a/...ts/s3_swift/multisite_configs/test_sse_s3_bucket_enc_multipart_download_archive_site.yaml b/...ts/s3_swift/multisite_configs/test_sse_s3_bucket_enc_multipart_download_archive_site.yaml
@@ -17,6 +17,6 @@ config:
   enable_version: false
   sse_s3_per_bucket: true
   upload_type: multipart
-  delete_bucket_object: true
+  delete_bucket_object: false
   delete_bucket_object_version: false
   download_object_at_remote_site: true
diff --git a/rgw/v2/tests/s3_swift/reusable.py b/rgw/v2/tests/s3_swift/reusable.py
@@ -1700,6 +1700,23 @@ def prepare_for_bucket_lc_transition(config):
                 )
     if is_multisite:
         utils.exec_shell_cmd("radosgw-admin period update --commit")
+        if config.test_ops.get("test_ibm_cloud_transition", False):
+            # CEPH-83581977, test cloud transition of encrypted and compressed objects
+            utils.exec_shell_cmd(
+                "radosgw-admin zone placement modify --rgw-zone primary --placement-id default-placement  --compression zlib"
+            )
+            utils.exec_shell_cmd(
+                "ceph config set client.rgw.shared.pri rgw_crypt_default_encryption_key 4YSmvJtBv0aZ7geVgAsdpRnLBEwWSWlMIGnRS8a9TSA="
+            )
+            utils.exec_shell_cmd("ceph orch restart rgw.shared.pri")
+            remote_site_ssh_con = get_remote_conn_in_multisite()
+            remote_site_ssh_con.exec_command(
+                "radosgw-admin zone placement modify --rgw-zone primary --placement-id default-placement  --compression zlib"
+            )
+            remote_site_ssh_con.exec_command(
+                "ceph config set client.rgw.shared.sec rgw_crypt_default_encryption_key 4YSmvJtBv0aZ7geVgAsdpRnLBEwWSWlMIGnRS8a9TSA="
+            )
+            remote_site_ssh_con.exec_command("ceph orch restart rgw.shared.sec")
 
 
 def bucket_reshard_manual(bucket, config):

diff --git a/rgw/v2/tests/s3_swift/test_sse_s3_kms_with_vault.py b/rgw/v2/tests/s3_swift/test_sse_s3_kms_with_vault.py
@@ -227,7 +227,7 @@ def test_exec(config, ssh_con):
                         )
     # check sync status if a multisite cluster
     reusable.check_sync_status()
-
+    reusable.remove_user(each_user)
     # check for any crashes during the execution
     crash_info = reusable.check_for_crash()
     if crash_info: