From: Shilpa Jagannath <smanjara@redhat.com>
Date: Wed, 23 Oct 2024 18:27:08 +0000 (-0700)
Subject: qa/multisite: enable two zonegroup yaml
X-Git-Tag: testing/wip-rishabh-testing-20241204.130505~13^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=254dad29aa931ae6ebe586c61725855fcd194d54;p=ceph-ci.git

qa/multisite: enable two zonegroup yaml

Signed-off-by: Shilpa Jagannath <smanjara@redhat.com>
---

diff --git a/qa/suites/rgw/multisite/realms/two-zonegroup.yaml b/qa/suites/rgw/multisite/realms/two-zonegroup.yaml
new file mode 100644
index 00000000000..ac2104cdd05
--- /dev/null
+++ b/qa/suites/rgw/multisite/realms/two-zonegroup.yaml
@@ -0,0 +1,31 @@
+overrides:
+  rgw-multisite:
+    realm:
+      name: test-realm
+      is_default: true
+    zonegroups:
+      - name: a
+        is_master: true
+        is_default: true
+        endpoints: [c1.client.0]
+        enabled_features: ['resharding', 'notification_v2']
+        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]
+        enabled_features: ['resharding', 'notification_v2']
+        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, -a, '!fails_with_rgw']
diff --git a/qa/suites/rgw/multisite/realms/two-zonegroup.yaml.disabled b/qa/suites/rgw/multisite/realms/two-zonegroup.yaml.disabled
deleted file mode 100644
index 5e4234236a9..00000000000
--- a/qa/suites/rgw/multisite/realms/two-zonegroup.yaml.disabled
+++ /dev/null
@@ -1,31 +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]
-        enabled_features: ['resharding', 'notification_v2']
-        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]
-        enabled_features: ['resharding', 'notification_v2']
-        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]