qa/rgw: move mixed-version multisite tests out of upgrade suite

not really fixing anything, but moves the failures out of the normal
upgrade suite

Fixes: https://tracker.ceph.com/issues/49955
Signed-off-by: Casey Bodley <cbodley@redhat.com>

diff --git a/qa/suites/rgw-multisite-upgrade/pacific-x/% b/qa/suites/rgw-multisite-upgrade/pacific-x/%
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/qa/suites/rgw-multisite-upgrade/pacific-x/.qa b/qa/suites/rgw-multisite-upgrade/pacific-x/.qa
new file mode 120000 (symlink)
index 0000000..fea2489
--- /dev/null
+++ b/qa/suites/rgw-multisite-upgrade/pacific-x/.qa
@@ -0,0 +1 @@
+../.qa
\ No newline at end of file

diff --git a/qa/suites/rgw-multisite-upgrade/pacific-x/clusters.yaml b/qa/suites/rgw-multisite-upgrade/pacific-x/clusters.yaml
new file mode 100644 (file)
index 0000000..4e18096
--- /dev/null
+++ b/qa/suites/rgw-multisite-upgrade/pacific-x/clusters.yaml
@@ -0,0 +1,3 @@
+roles:
+- [c1.mon.a, c1.mgr.x, c1.osd.0, c1.osd.1, c1.osd.2, c1.client.0]
+- [c2.mon.a, c2.mgr.x, c2.osd.0, c2.osd.1, c2.osd.2, c2.client.0, c2.client.1]

diff --git a/qa/suites/rgw-multisite-upgrade/pacific-x/frontend.yaml b/qa/suites/rgw-multisite-upgrade/pacific-x/frontend.yaml
new file mode 120000 (symlink)
index 0000000..09ced62
--- /dev/null
+++ b/qa/suites/rgw-multisite-upgrade/pacific-x/frontend.yaml
@@ -0,0 +1 @@
+.qa/rgw_frontend/beast.yaml
\ No newline at end of file

diff --git a/qa/suites/rgw-multisite-upgrade/pacific-x/overrides.yaml b/qa/suites/rgw-multisite-upgrade/pacific-x/overrides.yaml
new file mode 100644 (file)
index 0000000..35ef026
--- /dev/null
+++ b/qa/suites/rgw-multisite-upgrade/pacific-x/overrides.yaml
@@ -0,0 +1,23 @@
+overrides:
+  ceph:
+    log-ignorelist:
+    - \(PG_AVAILABILITY\)
+    wait-for-scrub: false
+    conf:
+      client:
+        setuser: ceph
+        setgroup: ceph
+        debug rgw: 20
+        rgw crypt s3 kms backend: testing
+        rgw crypt s3 kms encryption keys: testkey-1=YmluCmJvb3N0CmJvb3N0LWJ1aWxkCmNlcGguY29uZgo=
+        rgw crypt require ssl: false
+        rgw sync log trim interval: 0
+        rgw curl low speed time: 300
+        rgw md log max shards: 4
+        rgw data log num shards: 4
+        rgw sync obj etag verify: true
+  rgw:
+    compression type: random
+  rgw-multisite-tests:
+    branch: pacific # run pacific branch of tests
+    repo: https://github.com/ceph/ceph.git

diff --git a/qa/suites/rgw-multisite-upgrade/pacific-x/realm.yaml b/qa/suites/rgw-multisite-upgrade/pacific-x/realm.yaml
new file mode 100644 (file)
index 0000000..30016d9
--- /dev/null
+++ b/qa/suites/rgw-multisite-upgrade/pacific-x/realm.yaml
@@ -0,0 +1,23 @@
+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: [c2.client.1]
+            is_pubsub: true
+  rgw-multisite-tests:
+    args: [tests.py, tests_ps.py]

diff --git a/qa/suites/rgw-multisite-upgrade/pacific-x/supported-random-distro$ b/qa/suites/rgw-multisite-upgrade/pacific-x/supported-random-distro$
new file mode 120000 (symlink)
index 0000000..0862b44
--- /dev/null
+++ b/qa/suites/rgw-multisite-upgrade/pacific-x/supported-random-distro$
@@ -0,0 +1 @@
+.qa/distros/supported-random-distro$
\ No newline at end of file

diff --git a/qa/suites/rgw-multisite-upgrade/pacific-x/tasks.yaml b/qa/suites/rgw-multisite-upgrade/pacific-x/tasks.yaml
new file mode 100644 (file)
index 0000000..8438585
--- /dev/null
+++ b/qa/suites/rgw-multisite-upgrade/pacific-x/tasks.yaml
@@ -0,0 +1,18 @@
+tasks:
+- install:
+    branch: pacific
+- ceph: {cluster: c1}
+- ceph: {cluster: c2}
+- parallel:
+  - upgrade-task
+- rgw:
+    c1.client.0:
+      port: 8000
+    c2.client.0:
+      port: 8000
+    c2.client.1:
+      port: 8001
+- rgw-multisite:
+- rgw-multisite-tests:
+    config:
+      reconfigure_delay: 60

diff --git a/qa/suites/rgw-multisite-upgrade/pacific-x/upgrade/.qa b/qa/suites/rgw-multisite-upgrade/pacific-x/upgrade/.qa
new file mode 120000 (symlink)
index 0000000..fea2489
--- /dev/null
+++ b/qa/suites/rgw-multisite-upgrade/pacific-x/upgrade/.qa
@@ -0,0 +1 @@
+../.qa
\ No newline at end of file

diff --git a/qa/suites/rgw-multisite-upgrade/pacific-x/upgrade/primary.yaml b/qa/suites/rgw-multisite-upgrade/pacific-x/upgrade/primary.yaml
new file mode 100644 (file)
index 0000000..a29581a
--- /dev/null
+++ b/qa/suites/rgw-multisite-upgrade/pacific-x/upgrade/primary.yaml
@@ -0,0 +1,8 @@
+upgrade-task:
+- install.upgrade: # leave c2 on pacific, upgrade c1 to current
+    c1.mon.a:
+    c1.mgr.x:
+    c1.osd.0:
+    c1.osd.1:
+    c1.osd.2:
+    c1.client.0:

diff --git a/qa/suites/rgw-multisite-upgrade/pacific-x/upgrade/secondary.yaml b/qa/suites/rgw-multisite-upgrade/pacific-x/upgrade/secondary.yaml
new file mode 100644 (file)
index 0000000..6669866
--- /dev/null
+++ b/qa/suites/rgw-multisite-upgrade/pacific-x/upgrade/secondary.yaml
@@ -0,0 +1,9 @@
+upgrade-task:
+- install.upgrade: # leave c1 on pacific, upgrade c2 to current
+    c2.mon.a:
+    c2.mgr.x:
+    c2.osd.0:
+    c2.osd.1:
+    c2.osd.2:
+    c2.client.0:
+    c2.client.1:

diff --git a/qa/suites/upgrade/pacific-x/rgw-multisite/% b/qa/suites/upgrade/pacific-x/rgw-multisite/%
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/qa/suites/upgrade/pacific-x/rgw-multisite/.qa b/qa/suites/upgrade/pacific-x/rgw-multisite/.qa
deleted file mode 120000 (symlink)
index fea2489..0000000
--- a/qa/suites/upgrade/pacific-x/rgw-multisite/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa
\ No newline at end of file

diff --git a/qa/suites/upgrade/pacific-x/rgw-multisite/clusters.yaml b/qa/suites/upgrade/pacific-x/rgw-multisite/clusters.yaml
deleted file mode 100644 (file)
index 4e18096..0000000
--- a/qa/suites/upgrade/pacific-x/rgw-multisite/clusters.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-roles:
-- [c1.mon.a, c1.mgr.x, c1.osd.0, c1.osd.1, c1.osd.2, c1.client.0]
-- [c2.mon.a, c2.mgr.x, c2.osd.0, c2.osd.1, c2.osd.2, c2.client.0, c2.client.1]

diff --git a/qa/suites/upgrade/pacific-x/rgw-multisite/frontend.yaml b/qa/suites/upgrade/pacific-x/rgw-multisite/frontend.yaml
deleted file mode 120000 (symlink)
index 09ced62..0000000
--- a/qa/suites/upgrade/pacific-x/rgw-multisite/frontend.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/rgw_frontend/beast.yaml
\ No newline at end of file

diff --git a/qa/suites/upgrade/pacific-x/rgw-multisite/overrides.yaml b/qa/suites/upgrade/pacific-x/rgw-multisite/overrides.yaml
deleted file mode 100644 (file)
index 35ef026..0000000
--- a/qa/suites/upgrade/pacific-x/rgw-multisite/overrides.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-overrides:
-  ceph:
-    log-ignorelist:
-    - \(PG_AVAILABILITY\)
-    wait-for-scrub: false
-    conf:
-      client:
-        setuser: ceph
-        setgroup: ceph
-        debug rgw: 20
-        rgw crypt s3 kms backend: testing
-        rgw crypt s3 kms encryption keys: testkey-1=YmluCmJvb3N0CmJvb3N0LWJ1aWxkCmNlcGguY29uZgo=
-        rgw crypt require ssl: false
-        rgw sync log trim interval: 0
-        rgw curl low speed time: 300
-        rgw md log max shards: 4
-        rgw data log num shards: 4
-        rgw sync obj etag verify: true
-  rgw:
-    compression type: random
-  rgw-multisite-tests:
-    branch: pacific # run pacific branch of tests
-    repo: https://github.com/ceph/ceph.git

diff --git a/qa/suites/upgrade/pacific-x/rgw-multisite/realm.yaml b/qa/suites/upgrade/pacific-x/rgw-multisite/realm.yaml
deleted file mode 100644 (file)
index 30016d9..0000000
--- a/qa/suites/upgrade/pacific-x/rgw-multisite/realm.yaml
+++ /dev/null
@@ -1,23 +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: [c2.client.1]
-            is_pubsub: true
-  rgw-multisite-tests:
-    args: [tests.py, tests_ps.py]

diff --git a/qa/suites/upgrade/pacific-x/rgw-multisite/supported-random-distro$ b/qa/suites/upgrade/pacific-x/rgw-multisite/supported-random-distro$
deleted file mode 120000 (symlink)
index 0862b44..0000000
--- a/qa/suites/upgrade/pacific-x/rgw-multisite/supported-random-distro$
+++ /dev/null
@@ -1 +0,0 @@
-.qa/distros/supported-random-distro$
\ No newline at end of file

diff --git a/qa/suites/upgrade/pacific-x/rgw-multisite/tasks.yaml b/qa/suites/upgrade/pacific-x/rgw-multisite/tasks.yaml
deleted file mode 100644 (file)
index 8438585..0000000
--- a/qa/suites/upgrade/pacific-x/rgw-multisite/tasks.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-tasks:
-- install:
-    branch: pacific
-- ceph: {cluster: c1}
-- ceph: {cluster: c2}
-- parallel:
-  - upgrade-task
-- rgw:
-    c1.client.0:
-      port: 8000
-    c2.client.0:
-      port: 8000
-    c2.client.1:
-      port: 8001
-- rgw-multisite:
-- rgw-multisite-tests:
-    config:
-      reconfigure_delay: 60

diff --git a/qa/suites/upgrade/pacific-x/rgw-multisite/upgrade/.qa b/qa/suites/upgrade/pacific-x/rgw-multisite/upgrade/.qa
deleted file mode 120000 (symlink)
index fea2489..0000000
--- a/qa/suites/upgrade/pacific-x/rgw-multisite/upgrade/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa
\ No newline at end of file

diff --git a/qa/suites/upgrade/pacific-x/rgw-multisite/upgrade/primary.yaml b/qa/suites/upgrade/pacific-x/rgw-multisite/upgrade/primary.yaml
deleted file mode 100644 (file)
index a29581a..0000000
--- a/qa/suites/upgrade/pacific-x/rgw-multisite/upgrade/primary.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-upgrade-task:
-- install.upgrade: # leave c2 on pacific, upgrade c1 to current
-    c1.mon.a:
-    c1.mgr.x:
-    c1.osd.0:
-    c1.osd.1:
-    c1.osd.2:
-    c1.client.0:

diff --git a/qa/suites/upgrade/pacific-x/rgw-multisite/upgrade/secondary.yaml b/qa/suites/upgrade/pacific-x/rgw-multisite/upgrade/secondary.yaml
deleted file mode 100644 (file)
index 6669866..0000000
--- a/qa/suites/upgrade/pacific-x/rgw-multisite/upgrade/secondary.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-upgrade-task:
-- install.upgrade: # leave c1 on pacific, upgrade c2 to current
-    c2.mon.a:
-    c2.mgr.x:
-    c2.osd.0:
-    c2.osd.1:
-    c2.osd.2:
-    c2.client.0:
-    c2.client.1: