From: Casey Bodley Date: Sun, 23 Apr 2017 23:37:49 +0000 (+0000) Subject: qa/rgw: add multisite suite X-Git-Tag: v12.1.0~10^2~50^2~6 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=16ab3a08a36505801508551e70e4cec2a129e090;p=ceph.git qa/rgw: add multisite suite Signed-off-by: Casey Bodley --- diff --git a/qa/suites/rgw/multisite/% b/qa/suites/rgw/multisite/% new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/qa/suites/rgw/multisite/clusters.yaml b/qa/suites/rgw/multisite/clusters.yaml new file mode 100644 index 000000000000..536ef7ca446e --- /dev/null +++ b/qa/suites/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, c1.client.1] +- [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/frontend/civetweb.yaml b/qa/suites/rgw/multisite/frontend/civetweb.yaml new file mode 100644 index 000000000000..5845a0e6c15c --- /dev/null +++ b/qa/suites/rgw/multisite/frontend/civetweb.yaml @@ -0,0 +1,3 @@ +overrides: + rgw: + frontend: civetweb diff --git a/qa/suites/rgw/multisite/overrides.yaml b/qa/suites/rgw/multisite/overrides.yaml new file mode 100644 index 000000000000..c41470d521b5 --- /dev/null +++ b/qa/suites/rgw/multisite/overrides.yaml @@ -0,0 +1,8 @@ +overrides: + ceph: + wait-for-scrub: false + conf: + client: + debug rgw: 20 + rgw: + compression type: random diff --git a/qa/suites/rgw/multisite/realms/three-zone.yaml b/qa/suites/rgw/multisite/realms/three-zone.yaml new file mode 100644 index 000000000000..a8a7ca1d138b --- /dev/null +++ b/qa/suites/rgw/multisite/realms/three-zone.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] + - name: test-zone3 + endpoints: [c1.client.1] 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 000000000000..dc5a786ceb25 --- /dev/null +++ b/qa/suites/rgw/multisite/realms/two-zonegroup.yaml @@ -0,0 +1,27 @@ +overrides: + rgw-multisite: + realm: + name: test-realm + is default: true + zonegroups: + - name: a + is_master: true + is_default: true + endpoints: [c1.client.0] + 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] + zones: + - name: b1 + is_master: true + is_default: true + endpoints: [c2.client.0] + - name: b2 + endpoints: [c2.client.1] diff --git a/qa/suites/rgw/multisite/tasks/test_multi.yaml b/qa/suites/rgw/multisite/tasks/test_multi.yaml new file mode 100644 index 000000000000..5a4536c010ff --- /dev/null +++ b/qa/suites/rgw/multisite/tasks/test_multi.yaml @@ -0,0 +1,15 @@ +tasks: +- install: +- ceph: {cluster: c1} +- ceph: {cluster: c2} +- rgw: + c1.client.0: + valgrind: [--tool=memcheck] + c1.client.1: + valgrind: [--tool=memcheck] + c2.client.0: + valgrind: [--tool=memcheck] + c2.client.1: + valgrind: [--tool=memcheck] +- rgw-multisite: +- rgw-multisite-tests: diff --git a/qa/suites/rgw/multisite/valgrind.yaml b/qa/suites/rgw/multisite/valgrind.yaml new file mode 100644 index 000000000000..1e17c783a079 --- /dev/null +++ b/qa/suites/rgw/multisite/valgrind.yaml @@ -0,0 +1,13 @@ +os_type: centos # xenial valgrind buggy, see http://tracker.ceph.com/issues/18126 +overrides: + install: + ceph: + flavor: notcmalloc + ceph: + conf: + global: + osd heartbeat grace: 40 + valgrind: + mon: [--tool=memcheck, --leak-check=full, --show-reachable=yes] + osd: [--tool=memcheck] + mds: [--tool=memcheck]