Adding upstream version 18.2.2.upstream/18.2.2

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

11 files changed, 85 insertions, 0 deletions

diff --git a/qa/suites/rgw-multisite-upgrade/pacific-x/% b/qa/suites/rgw-multisite-upgrade/pacific-x/%
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/qa/suites/rgw-multisite-upgrade/pacific-x/%
diff --git a/qa/suites/rgw-multisite-upgrade/pacific-x/.qa b/qa/suites/rgw-multisite-upgrade/pacific-x/.qa
new file mode 120000
index 000000000..a602a0353
--- /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
index 000000000..4e18096e0
--- /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
index 000000000..09ced62c4
--- /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
index 000000000..35ef026d6
--- /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
index 000000000..86fc0732f
--- /dev/null
+++ b/qa/suites/rgw-multisite-upgrade/pacific-x/realm.yaml
@@ -0,0 +1,20 @@
+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]
+  rgw-multisite-tests:
+    args: [tests.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
index 000000000..0862b4457
--- /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
index 000000000..843858543
--- /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
index 000000000..a602a0353
--- /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
index 000000000..a29581aa6
--- /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
index 000000000..666986697
--- /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: