From: Shilpa Jagannath <smanjara@redhat.com>
Date: Mon, 15 Apr 2024 14:54:57 +0000 (-0400)
Subject: qa/multisite: disable two-zonegroup and three-zone configs.
X-Git-Tag: v17.2.8~5^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F60479%2Fhead;p=ceph.git

qa/multisite: disable two-zonegroup and three-zone configs.

Signed-off-by: Shilpa Jagannath <smanjara@redhat.com>
(cherry picked from commit fb3186266ee52b352ebdf4ce394d3144a23db8f2)
(cherry picked from commit 7f0ae8e03636cf81811b295f62fdb4a5fddafbf2)
(cherry picked from commit 824fce5521b1e3223767ae7e362aad77b1e48a3d)
---

diff --git a/qa/suites/rgw/multisite/overrides.yaml b/qa/suites/rgw/multisite/overrides.yaml
index 25145aa7d0b..c18440dc82d 100644
--- a/qa/suites/rgw/multisite/overrides.yaml
+++ b/qa/suites/rgw/multisite/overrides.yaml
@@ -6,6 +6,7 @@ overrides:
         setuser: ceph
         setgroup: ceph
         debug rgw: 20
+        debug rgw sync: 20
         rgw crypt s3 kms backend: testing
         rgw crypt s3 kms encryption keys: testkey-1=YmluCmJvb3N0CmJvb3N0LWJ1aWxkCmNlcGguY29uZgo=
         rgw crypt require ssl: false
@@ -16,6 +17,6 @@ overrides:
         rgw data sync poll interval: 5
         rgw meta sync poll interval: 5
         rgw sync obj etag verify: true
-        rgw sync meta inject err probability: 0.1
+        rgw sync meta inject err probability: 0.0
   rgw:
     compression type: random
diff --git a/qa/suites/rgw/multisite/realms/three-zones.yaml b/qa/suites/rgw/multisite/realms/three-zones.yaml
deleted file mode 100644
index cfa17e949d3..00000000000
--- a/qa/suites/rgw/multisite/realms/three-zones.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-overrides:
-  rgw-multisite:
-    realm:
-      name: test-realm
-      is default: true
-    zonegroups:
-      - name: test-zonegroup
-        is_master: true
-        is_default: true
-        endpoints: [c1.client.0]
-        zones:
-          - name: test-zone1
-            is_master: true
-            is_default: true
-            endpoints: [c1.client.0]
-          - name: test-zone2
-            is_default: true
-            endpoints: [c2.client.0]
-          - name: test-zone3
-            endpoints: [c1.client.1]
-  rgw-multisite-tests:
-    args: [tests.py]
diff --git a/qa/suites/rgw/multisite/realms/three-zones.yaml.disabled b/qa/suites/rgw/multisite/realms/three-zones.yaml.disabled
new file mode 100644
index 00000000000..cfa17e949d3
--- /dev/null
+++ b/qa/suites/rgw/multisite/realms/three-zones.yaml.disabled
@@ -0,0 +1,22 @@
+overrides:
+  rgw-multisite:
+    realm:
+      name: test-realm
+      is default: true
+    zonegroups:
+      - name: test-zonegroup
+        is_master: true
+        is_default: true
+        endpoints: [c1.client.0]
+        zones:
+          - name: test-zone1
+            is_master: true
+            is_default: true
+            endpoints: [c1.client.0]
+          - name: test-zone2
+            is_default: true
+            endpoints: [c2.client.0]
+          - name: test-zone3
+            endpoints: [c1.client.1]
+  rgw-multisite-tests:
+    args: [tests.py]
diff --git a/qa/suites/rgw/multisite/realms/two-zonegroup.yaml b/qa/suites/rgw/multisite/realms/two-zonegroup.yaml
deleted file mode 100644
index b78bb107055..00000000000
--- a/qa/suites/rgw/multisite/realms/two-zonegroup.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-overrides:
-  rgw-multisite:
-    realm:
-      name: test-realm
-      is default: true
-    zonegroups:
-      - name: a
-        is_master: true
-        is_default: true
-        endpoints: [c1.client.0]
-        zones:
-          - name: a1
-            is_master: true
-            is_default: true
-            endpoints: [c1.client.0]
-          - name: a2
-            endpoints: [c1.client.1]
-      - name: b
-        is_default: true
-        endpoints: [c2.client.0]
-        zones:
-          - name: b1
-            is_master: true
-            is_default: true
-            endpoints: [c2.client.0]
-          - name: b2
-            endpoints: [c2.client.1]
-  rgw-multisite-tests:
-    args: [tests.py]
diff --git a/qa/suites/rgw/multisite/realms/two-zonegroup.yaml.disabled b/qa/suites/rgw/multisite/realms/two-zonegroup.yaml.disabled
new file mode 100644
index 00000000000..b78bb107055
--- /dev/null
+++ b/qa/suites/rgw/multisite/realms/two-zonegroup.yaml.disabled
@@ -0,0 +1,29 @@
+overrides:
+  rgw-multisite:
+    realm:
+      name: test-realm
+      is default: true
+    zonegroups:
+      - name: a
+        is_master: true
+        is_default: true
+        endpoints: [c1.client.0]
+        zones:
+          - name: a1
+            is_master: true
+            is_default: true
+            endpoints: [c1.client.0]
+          - name: a2
+            endpoints: [c1.client.1]
+      - name: b
+        is_default: true
+        endpoints: [c2.client.0]
+        zones:
+          - name: b1
+            is_master: true
+            is_default: true
+            endpoints: [c2.client.0]
+          - name: b2
+            endpoints: [c2.client.1]
+  rgw-multisite-tests:
+    args: [tests.py]
diff --git a/qa/suites/rgw/multisite/realms/two-zones.yaml b/qa/suites/rgw/multisite/realms/two-zones.yaml
index 3564c9619b7..86fc0732fc7 100644
--- a/qa/suites/rgw/multisite/realms/two-zones.yaml
+++ b/qa/suites/rgw/multisite/realms/two-zones.yaml
@@ -8,7 +8,6 @@ overrides:
         is_master: true
         is_default: true
         endpoints: [c1.client.0]
-        enabled_features: ['resharding']
         zones:
           - name: test-zone1
             is_master: true