qa/rgw: add pacific-x upgrade suite for multisite

Signed-off-by: Casey Bodley <cbodley@redhat.com>

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

diff --git a/qa/suites/upgrade/pacific-x/rgw-multisite/.qa b/qa/suites/upgrade/pacific-x/rgw-multisite/.qa
new file mode 120000 (symlink)
index 0000000..fea2489
--- /dev/null
+++ b/qa/suites/upgrade/pacific-x/rgw-multisite/.qa
@@ -0,0 +1 @@
+../.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
new file mode 100644 (file)
index 0000000..4e18096
--- /dev/null
+++ b/qa/suites/upgrade/pacific-x/rgw-multisite/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/upgrade/pacific-x/rgw-multisite/frontend.yaml b/qa/suites/upgrade/pacific-x/rgw-multisite/frontend.yaml
new file mode 120000 (symlink)
index 0000000..09ced62
--- /dev/null
+++ b/qa/suites/upgrade/pacific-x/rgw-multisite/frontend.yaml
@@ -0,0 +1 @@
+.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
new file mode 100644 (file)
index 0000000..b298e9d
--- /dev/null
+++ b/qa/suites/upgrade/pacific-x/rgw-multisite/overrides.yaml
@@ -0,0 +1,26 @@
+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
+  install:
+    ceph:
+      branch: pacific
+  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
new file mode 100644 (file)
index 0000000..30016d9
--- /dev/null
+++ b/qa/suites/upgrade/pacific-x/rgw-multisite/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/upgrade/pacific-x/rgw-multisite/tasks.yaml b/qa/suites/upgrade/pacific-x/rgw-multisite/tasks.yaml
new file mode 100644 (file)
index 0000000..0a0bac1
--- /dev/null
+++ b/qa/suites/upgrade/pacific-x/rgw-multisite/tasks.yaml
@@ -0,0 +1,17 @@
+tasks:
+- install:
+- 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
new file mode 120000 (symlink)
index 0000000..fea2489
--- /dev/null
+++ b/qa/suites/upgrade/pacific-x/rgw-multisite/upgrade/.qa
@@ -0,0 +1 @@
+../.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
new file mode 100644 (file)
index 0000000..a29581a
--- /dev/null
+++ b/qa/suites/upgrade/pacific-x/rgw-multisite/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/upgrade/pacific-x/rgw-multisite/upgrade/secondary.yaml b/qa/suites/upgrade/pacific-x/rgw-multisite/upgrade/secondary.yaml
new file mode 100644 (file)
index 0000000..6669866
--- /dev/null
+++ b/qa/suites/upgrade/pacific-x/rgw-multisite/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: