From c884e6792e68dc8046811a4db3b7b92e1e2cd422 Mon Sep 17 00:00:00 2001
From: Hemanth Sai Maheswarla <hemanthsaimaheswarla@Hemanths-MacBook-Pro.local>
Date: Wed, 1 Jan 2025 16:20:29 +0530
Subject: [PATCH] integrating rgw MOD hotfix 404 again bz veritifcation tests

Signed-off-by: Hemanth Sai Maheswarla <hemanthsaimaheswarla@Hemanths-MacBook-Pro.local>
---
 suites/pacific/rgw/tier-4-rgw.yaml                   | 12 ++++++++++++
 suites/reef/rgw/tier-4-rgw.yaml                      | 12 ++++++++++++
 .../squid/rgw/tier-2_rgw_ssl_cephadm_gen_cert.yaml   |  2 +-
 suites/squid/rgw/tier-4-rgw.yaml                     | 12 ++++++++++++
 4 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/suites/pacific/rgw/tier-4-rgw.yaml b/suites/pacific/rgw/tier-4-rgw.yaml
index dd80bc56d..0d3b536b0 100644
--- a/suites/pacific/rgw/tier-4-rgw.yaml
+++ b/suites/pacific/rgw/tier-4-rgw.yaml
@@ -218,3 +218,15 @@ tests:
       config:
         script-name: test_swift_basic_ops.py
         config-file-name: test_s3_and_swift_versioning.yaml
+
+  # test MOD hotfix bz: complete and abort multipart upload race causes obj download failure after gc kicks in
+
+  - test:
+      name: test MOD hotfix bz - 404 again
+      desc: complete and abort multipart upload race causes obj download failure after gc kicks in
+      polarion-id: CEPH-83604471
+      module: sanity_rgw.py
+      config:
+        script-name: test_Mbuckets_with_Nobjects.py
+        config-file-name: test_Mbuckets_with_Nobjects_multipart_upload_complete_abort_race.yaml
+      comments: known issue BZ 2331908
diff --git a/suites/reef/rgw/tier-4-rgw.yaml b/suites/reef/rgw/tier-4-rgw.yaml
index a42243abb..7c195d80b 100644
--- a/suites/reef/rgw/tier-4-rgw.yaml
+++ b/suites/reef/rgw/tier-4-rgw.yaml
@@ -260,3 +260,15 @@ tests:
       config:
         script-name: test_s3select.py
         config-file-name: test_s3select_query_gen_parquet_depth2.yaml
+
+  # test MOD hotfix bz: complete and abort multipart upload race causes obj download failure after gc kicks in
+
+  - test:
+      name: test MOD hotfix bz - 404 again
+      desc: complete and abort multipart upload race causes obj download failure after gc kicks in
+      polarion-id: CEPH-83604471
+      module: sanity_rgw.py
+      config:
+        script-name: test_Mbuckets_with_Nobjects.py
+        config-file-name: test_Mbuckets_with_Nobjects_multipart_upload_complete_abort_race.yaml
+      comments: known issue BZ 2331908
diff --git a/suites/squid/rgw/tier-2_rgw_ssl_cephadm_gen_cert.yaml b/suites/squid/rgw/tier-2_rgw_ssl_cephadm_gen_cert.yaml
index 9500b1fb7..54371ee91 100644
--- a/suites/squid/rgw/tier-2_rgw_ssl_cephadm_gen_cert.yaml
+++ b/suites/squid/rgw/tier-2_rgw_ssl_cephadm_gen_cert.yaml
@@ -122,7 +122,7 @@ tests:
                         nodes:
                           - node5
       desc: RHCS cluster deployment and rgw deployment with ssl cert generation
-      polarion-id: CEPH-83575222
+      polarion-id: CEPH-83604472
       destroy-cluster: false
       module: test_cephadm.py
       name: deploy cluster and rgw with ssl gen-cert
diff --git a/suites/squid/rgw/tier-4-rgw.yaml b/suites/squid/rgw/tier-4-rgw.yaml
index d47d500eb..118a8e796 100644
--- a/suites/squid/rgw/tier-4-rgw.yaml
+++ b/suites/squid/rgw/tier-4-rgw.yaml
@@ -279,3 +279,15 @@ tests:
       config:
         script-name: test_s3select.py
         config-file-name: test_s3select_query_gen_parquet_depth2.yaml
+
+  # test MOD hotfix bz: complete and abort multipart upload race causes obj download failure after gc kicks in
+
+  - test:
+      name: test MOD hotfix bz - 404 again
+      desc: complete and abort multipart upload race causes obj download failure after gc kicks in
+      polarion-id: CEPH-83604471
+      module: sanity_rgw.py
+      config:
+        script-name: test_Mbuckets_with_Nobjects.py
+        config-file-name: test_Mbuckets_with_Nobjects_multipart_upload_complete_abort_race.yaml
+      comments: known issue BZ 2331908