From f1e4f6f9dcd9f754e7f71876e71fa88585052a51 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Tue, 16 Feb 2021 21:38:05 -0500 Subject: [PATCH] qa/rgw: add pacific-x upgrade suite for multisite Signed-off-by: Casey Bodley --- qa/suites/upgrade/pacific-x/rgw-multisite/% | 0 qa/suites/upgrade/pacific-x/rgw-multisite/.qa | 1 + .../pacific-x/rgw-multisite/clusters.yaml | 3 +++ .../pacific-x/rgw-multisite/frontend.yaml | 1 + .../pacific-x/rgw-multisite/overrides.yaml | 26 +++++++++++++++++++ .../pacific-x/rgw-multisite/realm.yaml | 23 ++++++++++++++++ .../pacific-x/rgw-multisite/tasks.yaml | 17 ++++++++++++ .../pacific-x/rgw-multisite/upgrade/.qa | 1 + .../rgw-multisite/upgrade/primary.yaml | 8 ++++++ .../rgw-multisite/upgrade/secondary.yaml | 9 +++++++ 10 files changed, 89 insertions(+) create mode 100644 qa/suites/upgrade/pacific-x/rgw-multisite/% create mode 120000 qa/suites/upgrade/pacific-x/rgw-multisite/.qa create mode 100644 qa/suites/upgrade/pacific-x/rgw-multisite/clusters.yaml create mode 120000 qa/suites/upgrade/pacific-x/rgw-multisite/frontend.yaml create mode 100644 qa/suites/upgrade/pacific-x/rgw-multisite/overrides.yaml create mode 100644 qa/suites/upgrade/pacific-x/rgw-multisite/realm.yaml create mode 100644 qa/suites/upgrade/pacific-x/rgw-multisite/tasks.yaml create mode 120000 qa/suites/upgrade/pacific-x/rgw-multisite/upgrade/.qa create mode 100644 qa/suites/upgrade/pacific-x/rgw-multisite/upgrade/primary.yaml create mode 100644 qa/suites/upgrade/pacific-x/rgw-multisite/upgrade/secondary.yaml diff --git a/qa/suites/upgrade/pacific-x/rgw-multisite/% b/qa/suites/upgrade/pacific-x/rgw-multisite/% new file mode 100644 index 00000000000..e69de29bb2d diff --git a/qa/suites/upgrade/pacific-x/rgw-multisite/.qa b/qa/suites/upgrade/pacific-x/rgw-multisite/.qa new file mode 120000 index 00000000000..fea2489fdf6 --- /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 index 00000000000..4e18096e077 --- /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 index 00000000000..09ced62c42a --- /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 index 00000000000..b298e9d4a1a --- /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 index 00000000000..30016d96e7f --- /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 index 00000000000..0a0bac1a899 --- /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 index 00000000000..fea2489fdf6 --- /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 index 00000000000..a29581aa6c7 --- /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 index 00000000000..66698669750 --- /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: -- 2.39.5