From: Shilpa Jagannath Date: Fri, 1 Mar 2019 07:35:23 +0000 (+0530) Subject: Test case yaml organized in suites X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=06ddecf4c1030e40498c93f9ba3b52d6484dbb68;p=ceph.git Test case yaml organized in suites --- diff --git a/qa/suites/rgw/3way-tests/% b/qa/suites/rgw/3way-tests/% new file mode 100644 index 00000000000..e69de29bb2d diff --git a/qa/suites/rgw/3way-tests/6-node-bluestore.yaml b/qa/suites/rgw/3way-tests/6-node-bluestore.yaml new file mode 100644 index 00000000000..bee1b3e6e1d --- /dev/null +++ b/qa/suites/rgw/3way-tests/6-node-bluestore.yaml @@ -0,0 +1,35 @@ +roles: +- - c1.mon.a + - c1.mgr.x + - c1.mon.b + - c1.osd.0 + - c1.osd.1 + - c1.osd.2 +- - c1.osd.3 + - c1.osd.4 + - c1.osd.5 + - c1.rgw.0 + - c1.client.0 +- - c2.mon.a + - c2.mgr.y + - c2.mon.b + - c2.osd.0 + - c2.osd.1 + - c2.osd.2 +- - c2.osd.3 + - c2.osd.4 + - c2.osd.5 + - c2.rgw.1 + - c2.client.1 +- - c3.mon.a + - c3.mgr.y + - c3.mon.b + - c3.osd.0 + - c3.osd.1 + - c3.osd.2 +- - c3.osd.3 + - c3.osd.4 + - c3.osd.5 + - c3.rgw.2 + - c3.client.2 + diff --git a/qa/suites/rgw/3way-tests/6-node.yaml b/qa/suites/rgw/3way-tests/6-node.yaml new file mode 100644 index 00000000000..bee1b3e6e1d --- /dev/null +++ b/qa/suites/rgw/3way-tests/6-node.yaml @@ -0,0 +1,35 @@ +roles: +- - c1.mon.a + - c1.mgr.x + - c1.mon.b + - c1.osd.0 + - c1.osd.1 + - c1.osd.2 +- - c1.osd.3 + - c1.osd.4 + - c1.osd.5 + - c1.rgw.0 + - c1.client.0 +- - c2.mon.a + - c2.mgr.y + - c2.mon.b + - c2.osd.0 + - c2.osd.1 + - c2.osd.2 +- - c2.osd.3 + - c2.osd.4 + - c2.osd.5 + - c2.rgw.1 + - c2.client.1 +- - c3.mon.a + - c3.mgr.y + - c3.mon.b + - c3.osd.0 + - c3.osd.1 + - c3.osd.2 +- - c3.osd.3 + - c3.osd.4 + - c3.osd.5 + - c3.rgw.2 + - c3.client.2 + diff --git a/qa/suites/rgw/3way-tests/tests/CEPH-10700.yaml b/qa/suites/rgw/3way-tests/tests/CEPH-10700.yaml new file mode 100644 index 00000000000..12322d1a408 --- /dev/null +++ b/qa/suites/rgw/3way-tests/tests/CEPH-10700.yaml @@ -0,0 +1,71 @@ +tasks: +- ssh-keys: null +- ceph-ansible: + cluster: c1 +- ceph-ansible: + cluster: c2 +- ceph-ansible: + cluster: c3 +- install.ship_utilities: null +- new-rgw-multisite: + realm: + name: test-realm + is_default: true + zonegroups: + - name: test-zg + is_master: true + is_default: true + zones: + - name: zone1 + is_master: true + is_default: true + endpoints: [c1.rgw.0] + - name: zone2 + is_default: true + endpoints: [c2.rgw.1] +- new-rgw-multisite.addzone: + name: zone3 + endpoints: c3.rgw.2 +- netem: + clients: [c1.rgw.0] + dst_client: c2.rgw.1 + iface: eno1 + delay: 20ms +- netem: + clients: [c1.rgw.0] + dst_client: c3.rgw.2 + iface: eno1 + delay: 10ms +- multisite-test.userexec: + master_client: c1.rgw.0 + test_dir_version: v1 + master_config: + user_count: 3 +- sleep: + duration: 60 +- multisite-test: + test-name: test_Mbuckets_with_Nobjects + test_dir_version: v1 + test_client: c1.rgw.0 + bucket_count: 5 + objects_count: 5 + min_file_size: 5 + max_file_size: 10 +- sleep: + duration: 60 +- multisite-test.pull-io-info: +- verify-io: + verification_script: read_io_info +- multisite-test: + test-name: test_multipart_upload_download + test_dir_version: v1 + test_client: c3.rgw.2 + target_config: + bucket_count: 5 + min_file_size: 100 + max_file_size: 200 +- sleep: + duration: 60 +- multisite-test.pull-io-info: +- verify-io: + verification_script: read_io_info diff --git a/qa/suites/rgw/3way-tests/tests/CEPH-10701.yaml b/qa/suites/rgw/3way-tests/tests/CEPH-10701.yaml new file mode 100644 index 00000000000..91c34a86f78 --- /dev/null +++ b/qa/suites/rgw/3way-tests/tests/CEPH-10701.yaml @@ -0,0 +1,124 @@ +tasks: +- ssh-keys: null +- ceph-ansible: + cluster: c1 +- ceph-ansible: + cluster: c2 +- ceph-ansible: + cluster: c3 +- install.ship_utilities: null +- new_rgw_multisite: + realm: + name: test-realm + is_default: true + zonegroups: + - name: test-zg + is_master: true + is_default: true + zones: + - name: test-zone + is_master: true + is_default: true + endpoints: [c1.rgw.0] + - name: test-zone2 + is_default: true + endpoints: [c2.rgw.1] +- new-rgw-multisite.addzone: + name: zone3 + endpoints: c3.rgw.2 +- multisite-test.userexec: + master_client: c1.rgw.0 + test_dir_version: v1 + master_config: + user_count: 3 +- sleep: + duration: 60 +- multisite-test: + test-name: Mbuckets + test_dir_version: v2 + test_client: c2.rgw.1 + bucket_count: 5 + test_ops: + create_bucket: true + sharding: + enable: false + max_shards: 0 +- sleep: + duration: 60 +- multisite-test.pull-io-info: +- ceph-ipmi.poweroff: [c1.rgw.0] +- ceph-ipmi.poweroff: [c2.rgw.1] +- multisite-test: + test-name: Mbuckets_with_Nobjects_create + test_dir_version: v2 + test_client: c3.rgw.2 + objects_count: 10 + objects_size_range: + min: 5 + max: 15 + test_ops: + create_object: true + download_object: false + delete_bucket_object: false +- ceph-ipmi.poweron: [c1.rgw.0] +- ceph-ipmi.poweron: [c2.rgw.1] +- sleep: + duration: 120 +- multisite-test.pull-io-info: +- verify-io: + verification_script: read_io_info +- ceph-ipmi.poweroff: [c2.rgw.1] +- ceph-ipmi.poweroff: [c3.rgw.2] +- multisite-test: + test-name: Mbuckets_with_Nobjects_download + test_dir_version: v2 + test_client: c2.rgw.1 + objects_count: 5 + objects_size_range: + min: 5 + max: 15 + test_ops: + create_object: true + download_object: true + delete_bucket_object: false +- ceph-ipmi.poweron: [c2.rgw.1] +- ceph-ipmi.poweron: [c3.rgw.2] +- sleep: + duration: 120 +- multisite-test.pull-io-info: +- verify-io: + verification_script: read_io_info +- multisite-test: + test-name: Mbuckets + test_dir_version: v2 + test_client: c1.rgw.0 + bucket_count: 5 + test_ops: + create_bucket: true + sharding: + enable: false + max_shards: 0 +- sleep: + duration: 60 +- multisite-test.pull-io-info: +- ceph-ipmi.poweroff: [c1.rgw.0] +- ceph-ipmi.poweroff: [c3.rgw.2] +- multisite-test: + test-name: Mbuckets_with_Nobjects_delete + test_dir_version: v2 + test_client: c2.rgw.1 + objects_count: 5 + objects_size_range: + min: 5 + max: 15 + test_ops: + create_object: true + download_object: false + delete_bucket_object: true +- ceph-ipmi.poweron: [c1.rgw.0] +- ceph-ipmi.poweron: [c3.rgw.2] +- sleep: + duration: 120 +- multisite-test.pull-io-info: +- verify-io: + verification_script: read_io_info diff --git a/qa/suites/rgw/3way-tests/tests/CEPH-10704.yaml b/qa/suites/rgw/3way-tests/tests/CEPH-10704.yaml new file mode 100644 index 00000000000..b79c1d303d3 --- /dev/null +++ b/qa/suites/rgw/3way-tests/tests/CEPH-10704.yaml @@ -0,0 +1,71 @@ +tasks: +- ssh-keys: null +- ceph-ansible: + cluster: c1 +- ceph-ansible: + cluster: c2 +- ceph-ansible: + cluster: c3 +- install.ship_utilities: null +- new-rgw-multisite: + realm: + name: test-realm + is_default: true + zonegroups: + - name: test-zg + is_master: true + is_default: true + zones: + - name: zone1 + is_master: true + is_default: true + endpoints: [c1.rgw.0] + - name: zone2 + is_default: true + endpoints: [c2.rgw.1] +- new-rgw-multisite.addzone: + name: zone3 + endpoints: c3.rgw.2 +- netem: + clients: [c1.rgw.0] + dst_client: c2.rgw.1 + iface: eno1 + delay_range: [20ms, 200ms] +- netem: + clients: [c1.rgw.0] + dst_client: c3.rgw.2 + iface: eno1 + delay_range: [10ms, 100ms] +- multisite-test.userexec: + master_client: c1.rgw.0 + test_dir_version: v1 + master_config: + user_count: 3 +- sleep: + duration: 60 +- multisite-test: + test-name: test_Mbuckets_with_Nobjects + test_dir_version: v1 + test_client: c2.rgw.1 + bucket_count: 20 + objects_count: 100 + min_file_size: 50 + max_file_size: 100 +- sleep: + duration: 60 +- multisite-test.pull-io-info: +- verify-io: + verification_script: read_io_info +- multisite-test: + test-name: test_multipart_upload_download + test_dir_version: v1 + test_client: c3.rgw.2 + target_config: + bucket_count: 5 + min_file_size: 100 + max_file_size: 200 +- sleep: + duration: 60 +- multisite-test.pull-io-info: +- verify-io: + verification_script: read_io_info diff --git a/qa/suites/rgw/haproxy-tests/% b/qa/suites/rgw/haproxy-tests/% new file mode 100644 index 00000000000..e69de29bb2d diff --git a/qa/suites/rgw/haproxy-tests/clusters/4-node-haproxy.yaml b/qa/suites/rgw/haproxy-tests/clusters/4-node-haproxy.yaml new file mode 100644 index 00000000000..8f079e8595e --- /dev/null +++ b/qa/suites/rgw/haproxy-tests/clusters/4-node-haproxy.yaml @@ -0,0 +1,35 @@ +roles: +- - c1.mon.a + - c1.mgr.x + - c1.osd.0 + - c1.osd.1 + - c1.osd.2 +- - c1.osd.6 + - c1.osd.7 + - c1.osd.8 + - c1.rgw.0 + - c1.client.0 +- - c1.osd.3 + - c1.osd.4 + - c1.osd.5 + - c1.rgw.1 + - c1.client.1 +- - c1.haproxy.0 +- - c1.haproxy.1 +- - c2.mon.a + - c2.mgr.y + - c2.osd.0 + - c2.osd.1 + - c2.osd.2 +- - c2.osd.6 + - c2.osd.7 + - c2.osd.8 + - c2.rgw.0 + - c2.client.0 +- - c2.osd.3 + - c2.osd.4 + - c2.osd.5 + - c2.rgw.1 + - c2.client.1 +- - c2.haproxy.0 +- - c2.haproxy.1 diff --git a/qa/suites/rgw/haproxy-tests/tasks/CEPH-10117.yaml b/qa/suites/rgw/haproxy-tests/tasks/CEPH-10117.yaml new file mode 100644 index 00000000000..f44a52c32fd --- /dev/null +++ b/qa/suites/rgw/haproxy-tests/tasks/CEPH-10117.yaml @@ -0,0 +1,56 @@ +tasks: +- ssh-keys: null +- ceph-ansible: + cluster: c1 +- ceph-ansible: + cluster: c2 +- install.ship_utilities: null +- new-rgw-multisite: + migrate: true + realm: + name: test-realm + is_default: true + zonegroups: + - name: test-zg + is_master: true + is_default: true + zones: + - name: test-zone + is_master: true + is_default: true + endpoints: [c1.rgw.0, c1.rgw.1] + - name: test-zone2 + is_default: true + endpoints: [c2.rgw.0, c2.rgw.1] +- netem: + clients: [c1.rgw.0] + iface: eno1 + dst_client: c2.rgw.1 + delay: 30ms +- multisite-test.userexec: + test_dir_version: v2 + master_client: c1.rgw.0 + master_config: + user_count: 3 +- sleep: + duration: 60 +- multisite-test: + test_name: test_Mbuckets_basic + script_name: test_Mbuckets_basic + master_client: c1.haproxy.0 + test_dir_version: v2 +- sleep: + duration: 120 +- multisite-test.pull-io-info: +- verify-io: + verification_script: read_io_info +- multisite-test: + script_name: test_Mbuckets_with_Nobjects_basic + test_name: test_Mbuckets_with_Nobjects_basic + test_dir_version: v2 + test_client: c1.haproxy.1 +- sleep: + duration: 120 +- multisite-test.pull-io-info: +- verify-io: + verification_script: read_io_info \ No newline at end of file diff --git a/qa/suites/rgw/haproxy-tests/tasks/CEPH-10120.yaml b/qa/suites/rgw/haproxy-tests/tasks/CEPH-10120.yaml new file mode 100644 index 00000000000..38445e1d435 --- /dev/null +++ b/qa/suites/rgw/haproxy-tests/tasks/CEPH-10120.yaml @@ -0,0 +1,55 @@ +tasks: +- ssh-keys: null +- ceph-ansible: + cluster: c1 +- ceph-ansible: + cluster: c2 +- install.ship_utilities: null +- new-rgw-multisite: + realm: + name: test-realm + is_default: true + zonegroups: + - name: test-zg + is_master: true + is_default: true + zones: + - name: test-zone + is_master: true + is_default: true + endpoints: [c1.rgw.0, c1.rgw.1] + - name: test-zone2 + is_default: true + endpoints: [c2.rgw.0, c2.rgw.1] +- multisite-test.userexec: + master_client: c1.rgw.0 + test_dir_version: v1 + master_config: + user_count: 3 +- sleep: + duration: 60 +- netem: + clients: [c1.rgw.0] + iface: eno1 + dst_client: c2.rgw.1 + link_toggle_interval: 5 # no need to mention units. Dafault takes seconds. +- sleep: + duration: 5 +- multisite-test: + test-name: test_multipart_upload + test_dir_version: v1 + test_client: c1.haproxy.0 + target_config: + bucket_count: 5 + min_file_size: 5 + max_file_size: 10 +- sleep: + duration: 120 +- netem: + clients: [c1.rgw.0] + iface: eno1 + link_recover: true +- multisite-test.pull-io-info: +- verify-io: + verification_script: read_io_info + diff --git a/qa/suites/rgw/haproxy-tests/tasks/CEPH-10122.yaml b/qa/suites/rgw/haproxy-tests/tasks/CEPH-10122.yaml new file mode 100644 index 00000000000..3455bd7c999 --- /dev/null +++ b/qa/suites/rgw/haproxy-tests/tasks/CEPH-10122.yaml @@ -0,0 +1,64 @@ +tasks: +- ssh-keys: null +- ceph-ansible: + cluster: c1 +- ceph-ansible: + cluster: c2 +- install.ship_utilities: null +- new-rgw-multisite: + realm: + name: test-realm + is_default: true + zonegroups: + - name: test-zg + is_master: true + is_default: true + zones: + - name: test-zone + is_master: true + is_default: true + endpoints: [c1.rgw.0, c1.rgw.1] + - name: test-zone2 + is_default: true + endpoints: [c2.rgw.1, c2.rgw.0] +- netem: + clients: [c1.rgw.0] + dst_client: c2.rgw.1 + iface: eno1 + delay_range: [100ms, 200ms] +- multisite-test.userexec: + master_client: c1.rgw.0 + test_dir_version: v1 + master_config: + user_count: 3 +- sleep: + duration: 120 +- multisite-test.pull-io-info: +- multisite-test: + test-name: test_Mbuckets_with_Nobjects + test_dir_version: v1 + test_client: c1.haproxy.0 + bucket_count: 5 + objects_count: 5 + min_file_size: 5 + max_file_size: 10 +- sleep: + duration: 120 +- multisite-test.pull-io-info: +- verify-io: + verification_script: read_io_info +- multisite-test: + test-name: test_multipart_upload + test_dir_version: v1 + test_client: c1.haproxy.0 + target_config: + bucket_count: 5 + min_file_size: 5 + max_file_size: 10 +- sleep: + duration: 120 +- multisite-test.pull-io-info: +- verify-io: + verification_script: read_io_info + + diff --git a/qa/suites/rgw/haproxy-tests/tasks/CEPH-10131.yaml b/qa/suites/rgw/haproxy-tests/tasks/CEPH-10131.yaml new file mode 100644 index 00000000000..c9f5e54df97 --- /dev/null +++ b/qa/suites/rgw/haproxy-tests/tasks/CEPH-10131.yaml @@ -0,0 +1,47 @@ +tasks: +- ssh-keys: null +- ceph-ansible: + cluster: c1 +- ceph-ansible: + cluster: c2 +- install.ship_utilities: null +- new-rgw-multisite: + realm: + name: test-realm + is_default: true + zonegroups: + - name: test-zg + is_master: true + is_default: true + zones: + - name: test-zone + is_master: true + is_default: true + endpoints: [c1.rgw.0, c1.rgw.1] + - name: test-zone2 + is_default: true + endpoints: [c2.rgw.0, c2.rgw.1] +- multisite-test.userexec: + master_client: c1.rgw.0 + test_dir_version: v1 + master_config: + user_count: 3 +- sleep: + duration: 60 +- ceph-ipmi.poweroff: [c1.rgw.1] +- sleep: + duration: 90 +- multisite-test: + test-name: test_Mbuckets_with_Nobjects + test_dir_version: v1 + test_client: c1.haproxy.0 + bucket_count: 5 + objects_count: 5 + min_file_size: 5 + max_file_size: 10 +- sleep: + duration: 60 +- multisite-test.pull-io-info: +- verify-io: + verification_script: read_io_info +- ceph-ipmi.poweron: [c1.rgw.1] \ No newline at end of file diff --git a/qa/suites/rgw/haproxy-tests/tasks/CEPH-10140.yaml b/qa/suites/rgw/haproxy-tests/tasks/CEPH-10140.yaml new file mode 100644 index 00000000000..6ff8ac6fc2c --- /dev/null +++ b/qa/suites/rgw/haproxy-tests/tasks/CEPH-10140.yaml @@ -0,0 +1,46 @@ +tasks: +- ssh-keys: null +- ceph-ansible: + cluster: c1 +- ceph-ansible: + cluster: c2 +- install.ship_utilities: null +- new_rgw_multisite: + realm: + name: test-realm + is_default: true + zonegroups: + - name: test-zg + is_master: true + is_default: true + zones: + - name: test-zone + is_master: true + is_default: true + endpoints: [c1.rgw.0, c1.rgw.1] + - name: test-zone2 + is_default: true + is_read_only: true + endpoints: [c2.rgw.1, c2.rgw.0] +- multisite-test.userexec: + master_client: c1.rgw.0 + test_dir_version: v1 + master_config: + user_count: 3 +- sleep: + duration: 60 +- multisite-test: + test_client: c1.haproxy.0 + target_config: + bucket_count: 2 + objects_count: 20 + max_file_size: 10 + min_file_size: 5 + test-name: test_Mbuckets_with_Nobjects + test_dir_version: v1 +- sleep: + duration: 120 +- multisite-test.pull-io-info: +- verify-io: + verification_script: read_io_info + diff --git a/qa/suites/rgw/haproxy-tests/tasks/Mbuckets_with_Nobjects_delete.yaml b/qa/suites/rgw/haproxy-tests/tasks/Mbuckets_with_Nobjects_delete.yaml new file mode 100644 index 00000000000..ca7a2409916 --- /dev/null +++ b/qa/suites/rgw/haproxy-tests/tasks/Mbuckets_with_Nobjects_delete.yaml @@ -0,0 +1,38 @@ +tasks: +- ssh-keys: null +- ceph-ansible: + cluster: c1 +- ceph-ansible: + cluster: c2 +- install.ship_utilities: null +- new-rgw-multisite: + realm: + name: test-realm + is_default: true + zonegroups: + - name: test-zg + is_master: true + is_default: true + zones: + - name: test-zone + is_master: true + is_default: true + endpoints: [c1.rgw.0, c1.rgw.1] + - name: test-zone2 + is_default: true + endpoints: [c2.rgw.1, c2.rgw.0] +- netem: + clients: [c1.rgw.0] + iface: eno1 + dst_client: c2.rgw.1 + delay_range: [30ms, 100ms] +- multisite-test: + test_name: test_Mbuckets_with_Nobjects_delete + script_name: test_Mbuckets_with_Nobjects + test_dir_version: v2 + test_client: c1.haproxy.0 +- sleep: + duration: 120 +- multisite-test.pull-io-info: +- verify-io: + verification_script: read_io_info diff --git a/qa/suites/rgw/haproxy-tests/tasks/Mbuckets_with_Nobjects_download.yaml b/qa/suites/rgw/haproxy-tests/tasks/Mbuckets_with_Nobjects_download.yaml new file mode 100644 index 00000000000..cf2bf837f66 --- /dev/null +++ b/qa/suites/rgw/haproxy-tests/tasks/Mbuckets_with_Nobjects_download.yaml @@ -0,0 +1,34 @@ +tasks: +- ssh-keys: null +- ceph-ansible: + cluster: c1 +- ceph-ansible: + cluster: c2 +- install.ship_utilities: null +- new-rgw-multisite: + realm: + name: test-realm + is_default: true + zonegroups: + - name: test-zg + is_master: true + is_default: true + zones: + - name: test-zone + is_master: true + is_default: true + endpoints: [c1.rgw.0, c1.rgw.1] + - name: test-zone2 + is_default: true + endpoints: [c2.rgw.1, c2.rgw.0] +- netem: + clients: [c1.rgw.0] + iface: eno1 + dst_client: c2.rgw.1 + delay_range: [30ms, 100ms] +- multisite-test: + test_name: test_Mbuckets_with_Nobjects_download + script_name: test_Mbuckets_with_Nobjects + test_dir_version: v2 + test_client: c1.haproxy.0 + diff --git a/qa/suites/rgw/haproxy-tests/tasks/test_Mbuckets_with_Nobjects_basic.yaml b/qa/suites/rgw/haproxy-tests/tasks/test_Mbuckets_with_Nobjects_basic.yaml new file mode 100644 index 00000000000..54e680be9e8 --- /dev/null +++ b/qa/suites/rgw/haproxy-tests/tasks/test_Mbuckets_with_Nobjects_basic.yaml @@ -0,0 +1,52 @@ +tasks: +- ssh-keys: null +- ceph-ansible: + cluster: c1 +- ceph-ansible: + cluster: c2 +- install.ship_utilities: null +- new-rgw-multisite: + realm: + name: test-realm + is_default: true + zonegroups: + - name: test-zg + is_master: true + is_default: true + zones: + - name: test-zone + is_master: true + is_default: true + endpoints: [c1.rgw.0, c1.rgw.1] + - name: test-zone2 + is_default: true + endpoints: [c2.rgw.1, c2.rgw.0] +- netem: + clients: [c1.rgw.0] + iface: eno1 + dst_client: c2.rgw.1 + delay_range: [30ms, 100ms] +- multisite-test.userexec: + test_dir_version: v2 + master_client: c1.rgw.0 + master_config: + user_count: 2 +- sleep: + duration: 60 +- multisite-test: + test_name: test_Mbuckets_basic + script_name: test_Mbuckets_basic + master_client: c1.haproxy.0 + test_dir_version: v2 +- sleep: + duration: 120 +- multisite-test: + script_name: test_Mbuckets_with_Nobjects_basic + test_name: test_Mbuckets_with_Nobjects_basic + test_dir_version: v2 + test_client: c1.haproxy.0 +- sleep: + duration: 120 +- multisite-test.pull-io-info: +- verify-io: + verification_script: read_io_info diff --git a/qa/suites/rgw/haproxy-tests/tasks/test_basic_versioning.yaml b/qa/suites/rgw/haproxy-tests/tasks/test_basic_versioning.yaml new file mode 100644 index 00000000000..205cd4313e8 --- /dev/null +++ b/qa/suites/rgw/haproxy-tests/tasks/test_basic_versioning.yaml @@ -0,0 +1,45 @@ +tasks: +- ssh-keys: null +- ceph-ansible: + cluster: c1 +- ceph-ansible: + cluster: c2 +- install.ship_utilities: null +- new-rgw-multisite: + realm: + name: test-realm + is_default: true + zonegroups: + - name: test-zg + is_master: true + is_default: true + zones: + - name: test-zone + is_master: true + is_default: true + endpoints: [c1.rgw.0, c] + - name: test-zone2 + is_default: true + endpoints: [c2.rgw.1] +- netem: + clients: [c1.rgw.0] + iface: eno1 + dst_client: c2.rgw.1 + delay_range: [30ms, 100ms] +- multisite-test.userexec: + master_client: c1.rgw.0 + test_dir_version: v1 + master_config: + user_count: 3 +- sleep: + duration: 60 +- multisite-test: + test-name: test_basic_versioning + test_dir_version: v1 + test_client: c2.haproxy.0 + target_config: + bucket_count: 5 + objects_count: 10 + version_count: 5 + min_file_size: 10 + max_file_size: 20 diff --git a/qa/suites/rgw/haproxy-tests/tasks/test_multipart_upload.yaml b/qa/suites/rgw/haproxy-tests/tasks/test_multipart_upload.yaml new file mode 100644 index 00000000000..7cfcadba066 --- /dev/null +++ b/qa/suites/rgw/haproxy-tests/tasks/test_multipart_upload.yaml @@ -0,0 +1,48 @@ +tasks: +- ssh-keys: null +- ceph-ansible: + cluster: c1 +- ceph-ansible: + cluster: c2 +- install.ship_utilities: null +- new-rgw-multisite: + realm: + name: test-realm + is_default: true + zonegroups: + - name: test-zg + is_master: true + is_default: true + zones: + - name: test-zone + is_master: true + is_default: true + endpoints: [c1.rgw.0, c1.rgw.1] + - name: test-zone2 + is_default: true + endpoints: [c2.rgw.0, c2.rgw.1] +- netem: + clients: [c1.rgw.0] + iface: eno1 + dst_client: c2.rgw.0 + delay_range: [30ms, 100ms] +- multisite-test.userexec: + master_client: c1.rgw.0 + test_dir_version: v1 + master_config: + user_count: 3 +- sleep: + duration: 60 +- multisite-test: + test-name: test_multipart_upload + test_dir_version: v1 + test_client: c1.haproxy.0 + target_config: + bucket_count: 5 + min_file_size: 5 + max_file_size: 10 +- sleep: + duration: 60 +- multisite-test.pull-io-info: +- verify-io: + verification_script: read_io_info diff --git a/qa/suites/rgw/haproxy-tests/tasks/test_multipart_upload_cancel.yaml b/qa/suites/rgw/haproxy-tests/tasks/test_multipart_upload_cancel.yaml new file mode 100644 index 00000000000..aad0718816d --- /dev/null +++ b/qa/suites/rgw/haproxy-tests/tasks/test_multipart_upload_cancel.yaml @@ -0,0 +1,44 @@ +tasks: +- ssh-keys: null +- ceph-ansible: + cluster: c1 +- ceph-ansible: + cluster: c2 +- install.ship_utilities: null +- new-rgw-multisite: + realm: + name: test-realm + is_default: true + zonegroups: + - name: test-zg + is_master: true + is_default: true + zones: + - name: test-zone + is_master: true + is_default: true + endpoints: [c1.rgw.0] + - name: test-zone2 + is_default: true + endpoints: [c2.rgw.1] +- multisite-test.userexec: + master_client: c1.rgw.0 + test_dir_version: v1 + master_config: + user_count: 3 +- sleep: + duration: 60 +- multisite-test: + test-name: test_multipart_upload_cancel + test_dir_version: v1 + test_client: c2.haproxy.0 + target_config: + bucket_count: 5 + break_at_part_no: 10 + min_file_size: 100 + max_file_size: 200 +- sleep: + duration: 60 +- multisite-test.pull-io-info: +- verify-io: + verification_script: read_io_info diff --git a/qa/suites/rgw/haproxy-tests/tasks/test_multipart_upload_download.yaml b/qa/suites/rgw/haproxy-tests/tasks/test_multipart_upload_download.yaml new file mode 100644 index 00000000000..b1eff40cebd --- /dev/null +++ b/qa/suites/rgw/haproxy-tests/tasks/test_multipart_upload_download.yaml @@ -0,0 +1,48 @@ +tasks: +- ssh-keys: null +- ceph-ansible: + cluster: c1 +- ceph-ansible: + cluster: c2 +- install.ship_utilities: null +- new-rgw-multisite: + realm: + name: test-realm + is_default: true + zonegroups: + - name: test-zg + is_master: true + is_default: true + zones: + - name: test-zone + is_master: true + is_default: true + endpoints: [c1.rgw.0] + - name: test-zone2 + is_default: true + endpoints: [c2.rgw.1] +- netem: + clients: [c1.rgw.0] + iface: eno1 + dst_client: c2.rgw.1 + delay_range: [30ms, 100ms] +- multisite-test.userexec: + master_client: c1.rgw.0 + test_dir_version: v1 + master_config: + user_count: 3 +- sleep: + duration: 60 +- multisite-test: + test-name: test_multipart_upload_download + test_dir_version: v1 + test_client: c2.haproxy.0 + target_config: + bucket_count: 5 + min_file_size: 100 + max_file_size: 200 +- sleep: + duration: 60 +- multisite-test.pull-io-info: +- verify-io: + verification_script: read_io_info diff --git a/qa/suites/rgw/haproxy-tests/tasks/test_suspend_versioning.yaml b/qa/suites/rgw/haproxy-tests/tasks/test_suspend_versioning.yaml new file mode 100644 index 00000000000..4731042d0ab --- /dev/null +++ b/qa/suites/rgw/haproxy-tests/tasks/test_suspend_versioning.yaml @@ -0,0 +1,45 @@ +tasks: +- ssh-keys: null +- ceph-ansible: + cluster: c1 +- ceph-ansible: + cluster: c2 +- install.ship_utilities: null +- new_rgw_multisite: + realm: + name: test-realm + is_default: true + zonegroups: + - name: test-zg + is_master: true + is_default: true + zones: + - name: test-zone + is_master: true + is_default: true + endpoints: [c1.rgw.0] + - name: test-zone2 + is_default: true + endpoints: [c2.rgw.1] +- netem: + clients: [c1.rgw.0] + iface: eno1 + dst_client: c2.rgw.1 + delay_range: [30ms, 100ms] +- multisite-test.userexec: + master_client: c1.rgw.0 + test_dir_version: v1 + master_config: + user_count: 3 +- sleep: + duration: 60 +- multisite-test: + test-name: test_suspend_versioning + test_dir_version: v1 + test_client: c2.haproxy.0 + target_config: + bucket_count: 5 + objects_count: 10 + version_count: 5 + min_file_size: 10 + max_file_size: 20 diff --git a/qa/suites/rgw/haproxy-tests/tasks/test_version_with_revert.yaml b/qa/suites/rgw/haproxy-tests/tasks/test_version_with_revert.yaml new file mode 100644 index 00000000000..49c6f254fb4 --- /dev/null +++ b/qa/suites/rgw/haproxy-tests/tasks/test_version_with_revert.yaml @@ -0,0 +1,40 @@ +tasks: +- ssh-keys: null +- ceph-ansible: + cluster: c1 +- ceph-ansible: + cluster: c2 +- install.ship_utilities: null +- new-rgw-multisite: + realm: + name: test-realm + is_default: true + zonegroups: + - name: test-zg + is_master: true + is_default: true + zones: + - name: test-zone + is_master: true + is_default: true + endpoints: [c1.rgw.0] + - name: test-zone2 + is_default: true + endpoints: [c2.rgw.1] +- netem: + clients: [c1.rgw.0] + iface: eno1 + dst_client: c2.rgw.1 + delay_range: [30ms, 100ms] +- multisite-test.userexec: + master_client: c1.rgw.0 + test_dir_version: v1 + master_config: + user_count: 3 +- sleep: + duration: 60 +- multisite-test: + test-name: test_version_with_revert + test_dir_version: v1 + test_client: c1.haproxy.0 + diff --git a/qa/suites/rgw/multisite-ansible/clusters/4*3node.yaml b/qa/suites/rgw/multisite-ansible/clusters/4*3node.yaml new file mode 100644 index 00000000000..f16791bc74d --- /dev/null +++ b/qa/suites/rgw/multisite-ansible/clusters/4*3node.yaml @@ -0,0 +1,37 @@ +roles: +- - c1.mon.a + - c1.mgr.x + - c1.osd.0 + - c1.osd.1 + - c1.osd.2 +- - c1.osd.3 + - c1.osd.4 + - c1.osd.5 +- - c1.osd.6 + - c1.osd.7 + - c1.osd.8 + - c1.rgw.0 + - c1.client.0 +- - c1.osd.9 + - c1.osd.10 + - c1.osd.11 +- - c1.rgw.1 + - c1.client.1 +- - c2.mon.a + - c2.mgr.y + - c2.osd.0 + - c2.osd.1 + - c2.osd.2 +- - c2.osd.3 + - c2.osd.4 + - c2.osd.5 +- - c2.osd.6 + - c2.osd.7 + - c2.osd.8 + - c2.rgw.0 + - c2.client.0 +- - c2.osd.9 + - c2.osd.10 + - c2.osd.11 +- - c2.rgw.1 + - c2.client.1 diff --git a/qa/suites/rgw/multisite-ansible/clusters/4-node-bluestore.yaml b/qa/suites/rgw/multisite-ansible/clusters/4-node-bluestore.yaml new file mode 100644 index 00000000000..59890cdf380 --- /dev/null +++ b/qa/suites/rgw/multisite-ansible/clusters/4-node-bluestore.yaml @@ -0,0 +1,27 @@ +roles: +- - c1.mon.a + - c1.mgr.x + - c1.osd.0 + - c1.osd.1 + - c1.osd.2 + - c1.rgw.0 + - c1.client.0 +- - c1.osd.3 + - c1.osd.4 + - c1.osd.5 +- - c1.osd.6 + - c1.osd.7 + - c1.osd.8 +- - c2.mon.a + - c2.mgr.y + - c2.osd.0 + - c2.osd.1 + - c2.osd.2 +- - c2.osd.3 + - c2.osd.4 + - c2.osd.5 +- - c2.osd.6 + - c2.osd.7 + - c2.osd.8 + - c2.rgw.1 + - c2.client.1 diff --git a/qa/suites/rgw/multisite-ansible/clusters/4-node.yaml b/qa/suites/rgw/multisite-ansible/clusters/4-node.yaml index 75ad6255832..ff09451db36 100644 --- a/qa/suites/rgw/multisite-ansible/clusters/4-node.yaml +++ b/qa/suites/rgw/multisite-ansible/clusters/4-node.yaml @@ -1,23 +1,21 @@ roles: - - c1.mon.a - c1.mgr.x - - c1.mon.b - c1.osd.0 - c1.osd.1 - c1.osd.2 - - c1.osd.3 - c1.osd.4 - c1.osd.5 - - c1.rgw.0 +- - c1.rgw.0 - c1.client.0 - - c2.mon.a - c2.mgr.y - - c2.mon.b - c2.osd.0 - c2.osd.1 - c2.osd.2 - - c2.osd.3 - c2.osd.4 - c2.osd.5 - - c2.rgw.1 +- - c2.rgw.1 - c2.client.1 diff --git a/qa/suites/rgw/multisite-ansible/tasks/CEPH-10118.yaml b/qa/suites/rgw/multisite-ansible/tasks/CEPH-10118.yaml index 366c0572b78..803183f2180 100644 --- a/qa/suites/rgw/multisite-ansible/tasks/CEPH-10118.yaml +++ b/qa/suites/rgw/multisite-ansible/tasks/CEPH-10118.yaml @@ -1,11 +1,10 @@ tasks: - ssh-keys: null - ceph-ansible: - vars: - cluster: c1 + cluster: c1 - ceph-ansible: - vars: - cluster: c2 + cluster: c2 +- install.ship_utilities: null - new_rgw_multisite: realm: name: test-realm @@ -22,46 +21,34 @@ tasks: - name: test-zone2 is_default: true endpoints: [c2.rgw.1] +- netem: + clients: [c1.rgw.0] + iface: eno1 + dst_client: c2.rgw.1 + delay_range: [30ms, 100ms] - multisite-test.userexec: - master_client: c1.rgw.0 test_dir_version: v2 + master_client: c1.rgw.0 master_config: - cluster_name: c1 - user_count: 3 - target_client: c2.rgw.1 + user_count: 1 - sleep: - duration: 60 + duration: 60 - multisite-test: - test-name: Mbuckets + test_name: test_Mbuckets_basic + script_name: test_Mbuckets_basic test_dir_version: v2 - master_client: c1.rgw.0 - target_client: c2.rgw.1 - bucket_count: 5 - cluster_name: c1 - test_ops: - create_bucket: true - sharding: - enable: false - max_shards: 0 + test_client: c2.rgw.1 - sleep: - duration: 60 + duration: 120 - multisite-test.pull-io-info: - ceph-ipmi.poweroff: [c1.rgw.0] - multisite-test: - test-name: Mbuckets_with_Nobjects_create + test_name: Mbuckets_with_Nobjects_basic + script_name: test_Mbuckets_with_Nobjects_basic test_dir_version: v2 - master_client: c1.rgw.0 - target_client: c2.rgw.1 - objects_count: 10 - objects_size_range: - min: 5 - max: 15 - test_ops: - create_object: true - download_object: false - delete_bucket_object: false + test_client: c2.rgw.1 - sleep: - duration: 60 + duration: 120 - ceph-ipmi.poweron: [c1.rgw.0] - multisite-test.pull-io-info: - verify-io: diff --git a/qa/suites/rgw/multisite-ansible/tasks/CEPH-10119.yaml b/qa/suites/rgw/multisite-ansible/tasks/CEPH-10119.yaml index fe987df171e..f9c9a3a7c8e 100644 --- a/qa/suites/rgw/multisite-ansible/tasks/CEPH-10119.yaml +++ b/qa/suites/rgw/multisite-ansible/tasks/CEPH-10119.yaml @@ -1,11 +1,10 @@ tasks: - ssh-keys: null - ceph-ansible: - vars: - cluster: c1 + cluster: c1 - ceph-ansible: - vars: - cluster: c2 + cluster: c2 +- install.ship_utilities: null - new_rgw_multisite: realm: name: test-realm @@ -22,19 +21,21 @@ tasks: - name: test-zone2 is_default: true endpoints: [c2.rgw.1] +- netem: + clients: [c1.rgw.0] + iface: eno1 + dst_client: c2.rgw.1 + delay_range: [30ms, 100ms] - multisite-test.userexec: master_client: c1.rgw.0 test_dir_version: v1 master_config: - cluster_name: c1 user_count: 3 - target_client: c2.rgw.1 - sleep: duration: 60 - ceph-ipmi.poweroff: [c2.rgw.1] - multisite-test: - master_client: c1.rgw.0 - target_client: c1.rgw.0 + test_client: c1.rgw.0 target_config: bucket_count: 2 objects_count: 10 diff --git a/qa/suites/rgw/multisite-ansible/tasks/CEPH-10129.yaml b/qa/suites/rgw/multisite-ansible/tasks/CEPH-10129.yaml new file mode 100644 index 00000000000..c8b41a714b0 --- /dev/null +++ b/qa/suites/rgw/multisite-ansible/tasks/CEPH-10129.yaml @@ -0,0 +1,58 @@ +tasks: +- ssh-keys: null +- ceph-ansible: + cluster: c1 +- ceph-ansible: + cluster: c2 +- install.ship_utilities: null +- new_rgw_multisite: + realm: + name: test-realm + is_default: true + zonegroups: + - name: test-zg + is_master: true + is_default: true + zones: + - name: test-zone + is_master: true + is_default: true + endpoints: [c1.rgw.0] + - name: test-zone2 + is_default: true + endpoints: [c2.rgw.1] +- netem: + clients: [c1.rgw.0] + iface: eno1 + dst_client: c2.rgw.1 + delay_range: [30ms, 100ms] +- multisite-test.userexec: + master_client: c1.rgw.0 + test_dir_version: v2 + master_config: + user_count: 3 +- sleep: + duration: 60 +- multisite-test: + test_name: test_Mbuckets_basic + script_name: test_Mbuckets_basic + test_dir_version: v2 + test_client: c2.rgw.1 +- sleep: + duration: 60 +- parallel: + - powercycle + - run-tests +powercycle: +- ceph-ipmi: [c1.rgw.0] +run-tests: +- multisite-test: + test_name: test_Mbuckets_with_Nobjects_basic + script_name: test_Mbuckets_with_Nobjects_basic + test_dir_version: v2 + test_client: c2.rgw.1 +- sleep: + duration: 120 +- multisite-test.pull-io-info: +- verify-io: + verification_script: read_io_info diff --git a/qa/suites/rgw/multisite-ansible/tasks/CEPH-10140.yaml b/qa/suites/rgw/multisite-ansible/tasks/CEPH-10140.yaml deleted file mode 100644 index 5317b1e2066..00000000000 --- a/qa/suites/rgw/multisite-ansible/tasks/CEPH-10140.yaml +++ /dev/null @@ -1,50 +0,0 @@ -tasks: -- ssh-keys: null -- ceph-ansible: - vars: - cluster: c1 -- ceph-ansible: - vars: - cluster: c2 -- new_rgw_multisite: - realm: - name: test-realm - is_default: true - zonegroups: - - name: test-zg - is_master: true - is_default: true - zones: - - name: test-zone - is_master: true - is_default: true - endpoints: [c1.rgw.0] - - name: test-zone2 - is_default: true - is_read_only: true - endpoints: [c2.rgw.1] -- multisite-test.userexec: - master_client: c1.rgw.0 - test_dir_version: v1 - master_config: - cluster_name: c1 - user_count: 3 - target_client: c2.rgw.1 -- sleep: - duration: 60 -- multisite-test: - master_client: c1.rgw.0 - target_client: c1.rgw.0 - target_config: - bucket_count: 2 - objects_count: 20 - max_file_size: 10 - min_file_size: 5 - test-name: test_Mbuckets_with_Nobjects - test_dir_version: v1 -- sleep: - duration: 60 -- multisite-test.pull-io-info: -- verify-io: - verification_script: read_io_info - diff --git a/qa/suites/rgw/multisite-ansible/tasks/CEPH-10141.yaml b/qa/suites/rgw/multisite-ansible/tasks/CEPH-10141.yaml index 2d65f0ec535..f5e16fd4420 100644 --- a/qa/suites/rgw/multisite-ansible/tasks/CEPH-10141.yaml +++ b/qa/suites/rgw/multisite-ansible/tasks/CEPH-10141.yaml @@ -1,11 +1,10 @@ tasks: - ssh-keys: null - ceph-ansible: - vars: - cluster: c1 + cluster: c1 - ceph-ansible: - vars: - cluster: c2 + cluster: c2 +- install.ship_utilities: null - new-rgw-multisite: realm: name: test-realm @@ -21,52 +20,53 @@ tasks: endpoints: [c1.rgw.0] - name: test-zone2 is_default: true - is_read_only: true endpoints: [c2.rgw.1] +- netem: + clients: [c1.rgw.0] + iface: eno1 + dst_client: c2.rgw.1 + delay_range: [30ms, 100ms] - multisite-test.userexec: master_client: c1.rgw.0 test_dir_version: v1 master_config: - cluster_name: c1 user_count: 3 - target_client: c2.rgw.1 - sleep: duration: 60 - ceph-ipmi.poweroff: [c1.rgw.0] - new-rgw-multisite.failover: + new_master_zone: test-zone2 + new_master: c2.rgw.1 - sleep: duration: 30 - multisite-test: - test-name: test_basic_versioning + test-name: test_Mbuckets_with_Nobjects test_dir_version: v1 - master_client: c2.rgw.1 - target_client: c2.rgw.1 - target_config: - bucket_count: 1 - objects_count: 2 - version_count: 3 - min_file_size: 10 - max_file_size: 20 + test_client: c2.rgw.1 + bucket_count: 2 + objects_count: 5 + min_file_size: 5 + max_file_size: 10 - ceph-ipmi.poweron: [c1.rgw.0] - sleep: duration: 60 - new-rgw-multisite.failback: - sleep: - duration: 120 + duration: 100 +- multisite-test.pull-io-info: - verify-io: verification_script: read_io_info - multisite-test: test-name: test_Mbuckets_with_Nobjects test_dir_version: v1 - master_client: c1.rgw.0 - target_client: c1.rgw.0 + test_client: c1.rgw.0 target_config: bucket_count: 5 objects_count: 5 min_file_size: 5 max_file_size: 10 - sleep: - duration: 60 + duration: 120 - multisite-test.pull-io-info: - verify-io: verification_script: read_io_info diff --git a/qa/suites/rgw/multisite-ansible/tasks/CEPH-9532.yaml b/qa/suites/rgw/multisite-ansible/tasks/CEPH-9532.yaml new file mode 100644 index 00000000000..3403da01937 --- /dev/null +++ b/qa/suites/rgw/multisite-ansible/tasks/CEPH-9532.yaml @@ -0,0 +1,78 @@ +tasks: +- ssh-keys: null +- ceph-ansible: + cluster: c1 +- ceph-ansible: + cluster: c2 +- install.ship_utilities: null +- new-rgw-multisite: + realm: + name: test-realm + is_default: true + zonegroups: + - name: test-zg + is_master: true + is_default: true + zones: + - name: zone1 + is_master: true + is_default: true + endpoints: [c1.rgw.0] + - name: zone2 + is_default: true + endpoints: [c2.rgw.1] +- netem: + clients: [c1.rgw.0] + iface: eno1 + dst_client: c2.rgw.1 + delay_range: [30ms, 100ms] +- multisite-test.userexec: + master_client: c1.rgw.0 + test_dir_version: v1 + master_config: + user_count: 3 +- sleep: + duration: 60 +- multisite-test: + test-name: test_Mbuckets_with_Nobjects + test_dir_version: v1 + test_client: c2.rgw.1 + bucket_count: 2 + objects_count: 2 + min_file_size: 5 + max_file_size: 10 +- sleep: + duration: 60 +- new-rgw-multisite.addzone: + name: zone3 + endpoints: c1.rgw.1 +- multisite-test: + test-name: test_Mbuckets_with_Nobjects + test_dir_version: v1 + test_client: c2.rgw.1 + bucket_count: 2 + objects_count: 2 + min_file_size: 5 + max_file_size: 10 +- sleep: + duration: 120 +- multisite-test.pull-io-info: +- verify-io: + verification_script: read_io_info +- new-rgw-multisite.failover: + new_master_zone: zone3 + new_master: c1.rgw.1 +- multisite-test: + test-name: test_Mbuckets_with_Nobjects + test_dir_version: v1 + test_client: c2.rgw.1 + bucket_count: 2 + objects_count: 2 + min_file_size: 5 + max_file_size: 10 +- sleep: + duration: 120 +- multisite-test.pull-io-info: +- verify-io: + verification_script: read_io_info + diff --git a/qa/suites/rgw/multisite-ansible/tasks/Mbuckets.yaml b/qa/suites/rgw/multisite-ansible/tasks/Mbuckets.yaml deleted file mode 100644 index a9434b98cfd..00000000000 --- a/qa/suites/rgw/multisite-ansible/tasks/Mbuckets.yaml +++ /dev/null @@ -1,50 +0,0 @@ -tasks: -- ssh-keys: null -- ceph-ansible: - vars: - cluster: c1 -- ceph-ansible: - vars: - cluster: c2 -- new-rgw-multisite: - realm: - name: test-realm - is_default: true - zonegroups: - - name: test-zg - is_master: true - is_default: true - zones: - - name: test-zone - is_master: true - is_default: true - endpoints: [c1.rgw.0] - - name: test-zone2 - is_default: true - endpoints: [c2.rgw.1] -- multisite-test.userexec: - test_dir_version: v2 - master_client: c1.rgw.0 - master_config: - cluster_name: c1 - user_count: 3 - target_client: c2.rgw.1 -- sleep: - duration: 60 -- multisite-test: - test-name: Mbuckets - test_dir_version: v2 - master_client: c1.rgw.0 - target_client: c2.rgw.1 - bucket_count: 5 - cluster_name: c1 - test_ops: - create_bucket: true - sharding: - enable: false - max_shards: 0 -- sleep: - duration: 60 -- multisite-test.pull-io-info: -- verify-io: - verification_script: read_io_info \ No newline at end of file diff --git a/qa/suites/rgw/multisite-ansible/tasks/Mbuckets_sharding.yaml b/qa/suites/rgw/multisite-ansible/tasks/Mbuckets_sharding.yaml deleted file mode 100644 index aaf00dcc2e4..00000000000 --- a/qa/suites/rgw/multisite-ansible/tasks/Mbuckets_sharding.yaml +++ /dev/null @@ -1,50 +0,0 @@ -tasks: -- ssh-keys: null -- ceph-ansible: - vars: - cluster: c1 -- ceph-ansible: - vars: - cluster: c2 -- new-rgw-multisite: - realm: - name: test-realm - is_default: true - zonegroups: - - name: test-zg - is_master: true - is_default: true - zones: - - name: test-zone - is_master: true - is_default: true - endpoints: [c1.rgw.0] - - name: test-zone2 - is_default: true - endpoints: [c2.rgw.1] -- multisite-test.userexec: - test_dir_version: v2 - master_client: c1.rgw.0 - master_config: - cluster_name: c1 - user_count: 3 - target_client: c2.rgw.1 -- sleep: - duration: 60 -- multisite-test: - test-name: Mbuckets_with_sharding - test_dir_version: v2 - master_client: c1.rgw.0 - target_client: c2.rgw.1 - bucket_count: 5 - cluster_name: c2 - test_ops: - create_bucket: true - sharding: - enable: true - max_shards: 32 -- sleep: - duration: 60 -- multisite-test.pull-io-info: -- verify-io: - verification_script: read_io_info \ No newline at end of file diff --git a/qa/suites/rgw/multisite-ansible/tasks/Mbuckets_with_Nobjects_create.yaml b/qa/suites/rgw/multisite-ansible/tasks/Mbuckets_with_Nobjects_create.yaml deleted file mode 100644 index 6bbaec90306..00000000000 --- a/qa/suites/rgw/multisite-ansible/tasks/Mbuckets_with_Nobjects_create.yaml +++ /dev/null @@ -1,66 +0,0 @@ -tasks: -- ssh-keys: null -- ceph-ansible: - vars: - cluster: c1 -- ceph-ansible: - vars: - cluster: c2 -- new-rgw-multisite: - realm: - name: test-realm - is_default: true - zonegroups: - - name: test-zg - is_master: true - is_default: true - zones: - - name: test-zone - is_master: true - is_default: true - endpoints: [c1.rgw.0] - - name: test-zone2 - is_default: true - endpoints: [c2.rgw.1] -- multisite-test.userexec: - test_dir_version: v2 - master_client: c1.rgw.0 - master_config: - cluster_name: c1 - user_count: 3 - target_client: c2.rgw.1 -- sleep: - duration: 60 -- multisite-test: - test-name: Mbuckets - test_dir_version: v2 - master_client: c1.rgw.0 - target_client: c2.rgw.1 - bucket_count: 5 - cluster_name: c1 - test_ops: - create_bucket: true - sharding: - enable: false - max_shards: 0 -- sleep: - duration: 60 -- multisite-test.pull-io-info: -- multisite-test: - test-name: Mbuckets_with_Nobjects_create - test_dir_version: v2 - master_client: c1.rgw.0 - target_client: c2.rgw.1 - objects_count: 10 - objects_size_range: - min: 5 - max: 15 - test_ops: - create_object: true - download_object: false - delete_bucket_object: false -- sleep: - duration: 60 -- multisite-test.pull-io-info: -- verify-io: - verification_script: read_io_info \ No newline at end of file diff --git a/qa/suites/rgw/multisite-ansible/tasks/Mbuckets_with_Nobjects_delete.yaml b/qa/suites/rgw/multisite-ansible/tasks/Mbuckets_with_Nobjects_delete.yaml deleted file mode 100644 index eecbc651b30..00000000000 --- a/qa/suites/rgw/multisite-ansible/tasks/Mbuckets_with_Nobjects_delete.yaml +++ /dev/null @@ -1,66 +0,0 @@ -tasks: -- ssh-keys: null -- ceph-ansible: - vars: - cluster: c1 -- ceph-ansible: - vars: - cluster: c2 -- new-rgw-multisite: - realm: - name: test-realm - is_default: true - zonegroups: - - name: test-zg - is_master: true - is_default: true - zones: - - name: test-zone - is_master: true - is_default: true - endpoints: [c1.rgw.0] - - name: test-zone2 - is_default: true - endpoints: [c2.rgw.1] -- multisite-test.userexec: - test_dir_version: v2 - master_client: c1.rgw.0 - master_config: - cluster_name: c1 - user_count: 3 - target_client: c2.rgw.1 -- sleep: - duration: 60 -- multisite-test: - test-name: Mbuckets - test_dir_version: v2 - master_client: c1.rgw.0 - target_client: c2.rgw.1 - bucket_count: 5 - cluster_name: c1 - test_ops: - create_bucket: true - sharding: - enable: false - max_shards: 0 -- sleep: - duration: 60 -- multisite-test.pull-io-info: -- multisite-test: - test-name: Mbuckets_with_Nobjects_delete - test_dir_version: v2 - master_client: c1.rgw.0 - target_client: c2.rgw.1 - objects_count: 5 - objects_size_range: - min: 5 - max: 15 - test_ops: - create_object: true - download_object: false - delete_bucket_object: true -- sleep: - duration: 60 -- multisite-test.pull-io-info: -- verify-io: - verification_script: read_io_info diff --git a/qa/suites/rgw/multisite-ansible/tasks/Mbuckets_with_Nobjects_download.yaml b/qa/suites/rgw/multisite-ansible/tasks/Mbuckets_with_Nobjects_download.yaml deleted file mode 100644 index ebe0382c397..00000000000 --- a/qa/suites/rgw/multisite-ansible/tasks/Mbuckets_with_Nobjects_download.yaml +++ /dev/null @@ -1,67 +0,0 @@ -tasks: -- ssh-keys: null -- ceph-ansible: - vars: - cluster: c1 -- ceph-ansible: - vars: - cluster: c2 -- new-rgw-multisite: - realm: - name: test-realm - is_default: true - zonegroups: - - name: test-zg - is_master: true - is_default: true - zones: - - name: test-zone - is_master: true - is_default: true - endpoints: [c1.rgw.0] - - name: test-zone2 - is_default: true - endpoints: [c2.rgw.1] -- multisite-test.userexec: - test_dir_version: v2 - master_client: c1.rgw.0 - master_config: - cluster_name: c1 - user_count: 3 - target_client: c2.rgw.1 -- sleep: - duration: 60 -- multisite-test: - test-name: Mbuckets - test_dir_version: v2 - master_client: c1.rgw.0 - target_client: c2.rgw.1 - bucket_count: 5 - cluster_name: c1 - test_ops: - create_bucket: true - sharding: - enable: false - max_shards: 0 -- sleep: - duration: 60 -- multisite-test.pull-io-info: -- multisite-test: - test-name: Mbuckets_with_Nobjects_download - test_dir_version: v2 - master_client: c1.rgw.0 - target_client: c2.rgw.1 - objects_count: 5 - objects_size_range: - min: 5 - max: 15 - test_ops: - create_object: true - download_object: true - delete_bucket_object: false -- sleep: - duration: 60 -- multisite-test.pull-io-info: -- verify-io: - verification_script: read_io_info - diff --git a/qa/suites/rgw/multisite-ansible/tasks/Mbuckets_with_Nobjects_encryption.yaml b/qa/suites/rgw/multisite-ansible/tasks/Mbuckets_with_Nobjects_encryption.yaml new file mode 100644 index 00000000000..02ebee771dc --- /dev/null +++ b/qa/suites/rgw/multisite-ansible/tasks/Mbuckets_with_Nobjects_encryption.yaml @@ -0,0 +1,39 @@ +tasks: +- ssh-keys: null +- ceph-ansible: + cluster: c1 +- ceph-ansible: + cluster: c2 +- install.ship_utilities: null +- new-rgw-multisite: + realm: + name: test-realm + is_default: true + zonegroups: + - name: test-zg + is_master: true + is_default: true + zones: + - name: test-zone + is_master: true + is_default: true + endpoints: [c1.rgw.0] + - name: test-zone2 + is_default: true + endpoints: [c2.rgw.1] +- netem: + clients: [c1.rgw.0] + iface: eno1 + dst_client: c2.rgw.1 + delay_range: [30ms, 100ms] +- multisite-test: + test_name: test_Mbuckets_with_Nobjects_enc + script_name: test_Mbuckets_with_Nobjects + test_dir_version: v2 + test_client: c1.rgw.0 +- sleep: + duration: 60 +- multisite-test.pull-io-info: +- verify-io: + verification_script: read_io_info + diff --git a/qa/suites/rgw/multisite-ansible/tasks/Mbuckets_with_Nobjects_sharding.yaml b/qa/suites/rgw/multisite-ansible/tasks/Mbuckets_with_Nobjects_sharding.yaml index 10a62a3074a..7e412a17667 100644 --- a/qa/suites/rgw/multisite-ansible/tasks/Mbuckets_with_Nobjects_sharding.yaml +++ b/qa/suites/rgw/multisite-ansible/tasks/Mbuckets_with_Nobjects_sharding.yaml @@ -1,11 +1,10 @@ tasks: - ssh-keys: null - ceph-ansible: - vars: - cluster: c1 + cluster: c1 - ceph-ansible: - vars: - cluster: c2 + cluster: c2 +- install.ship_utilities: null - new-rgw-multisite: realm: name: test-realm @@ -22,45 +21,18 @@ tasks: - name: test-zone2 is_default: true endpoints: [c2.rgw.1] -- multisite-test.userexec: - test_dir_version: v2 - master_client: c1.rgw.0 - master_config: - cluster_name: c1 - user_count: 3 - target_client: c2.rgw.1 -- sleep: - duration: 60 -- multisite-test: - test-name: Mbuckets_with_sharding - test_dir_version: v2 - master_client: c1.rgw.0 - target_client: c2.rgw.1 - bucket_count: 5 - cluster_name: c2 - test_ops: - create_bucket: true - sharding: - enable: true - max_shards: 32 -- sleep: - duration: 60 -- multisite-test.pull-io-info: +- netem: + clients: [c1.rgw.0] + iface: eno1 + dst_client: c2.rgw.1 + delay_range: [30ms, 100ms] - multisite-test: - test-name: Mbuckets_with_Nobjects_sharding + test_name: test_Mbuckets_with_Nobjects_sharding + script_name: test_Mbuckets_with_Nobjects test_dir_version: v2 - master_client: c1.rgw.0 - target_client: c2.rgw.1 - objects_count: 5 - objects_size_range: - min: 1000 - max: 1500 - test_ops: - create_object: true - download_object: false - delete_bucket_object: true + test_client: c2.rgw.1 - sleep: - duration: 60 + duration: 120 - multisite-test.pull-io-info: - verify-io: verification_script: read_io_info diff --git a/qa/suites/rgw/multisite-ansible/tasks/install.yaml b/qa/suites/rgw/multisite-ansible/tasks/install.yaml new file mode 100644 index 00000000000..f51d61de648 --- /dev/null +++ b/qa/suites/rgw/multisite-ansible/tasks/install.yaml @@ -0,0 +1,23 @@ +tasks: +- ssh-keys: null +- ceph-ansible: + cluster: c1 +- ceph-ansible: + cluster: c2 +- install.ship_utilities: null +- new-rgw-multisite: + realm: + name: test-realm + is_default: true + zonegroups: + - name: test-zg + is_master: true + is_default: true + zones: + - name: test-zone + is_master: true + is_default: true + endpoints: [c1.rgw.0] + - name: test-zone2 + is_default: true + endpoints: [c2.rgw.1] diff --git a/qa/suites/rgw/multisite-ansible/tasks/test_Mbuckets.yaml b/qa/suites/rgw/multisite-ansible/tasks/test_Mbuckets.yaml deleted file mode 100644 index 5b9cea0cac8..00000000000 --- a/qa/suites/rgw/multisite-ansible/tasks/test_Mbuckets.yaml +++ /dev/null @@ -1,44 +0,0 @@ -tasks: -- ssh-keys: null -- ceph-ansible: - vars: - cluster: c1 -- ceph-ansible: - vars: - cluster: c2 -- new-rgw-multisite: - realm: - name: test-realm - is_default: true - zonegroups: - - name: test-zg - is_master: true - is_default: true - zones: - - name: test-zone - is_master: true - is_default: true - endpoints: [c1.rgw.0] - - name: test-zone2 - is_default: true - endpoints: [c2.rgw.1] -- multisite-test.userexec: - master_client: c1.rgw.0 - test_dir_version: v1 - master_config: - cluster_name: c1 - user_count: 3 - target_client: c2.rgw.1 -- sleep: - duration: 60 -- multisite-test: - test-name: test_Mbuckets - test_dir_version: v1 - master_client: c1.rgw.0 - target_client: c2.rgw.1 - bucket_count: 5 -- sleep: - duration: 60 -- multisite-test.pull-io-info: -- verify-io: - verification_script: read_io_info diff --git a/qa/suites/rgw/multisite-ansible/tasks/test_Mbuckets_with_Nobjects.yaml b/qa/suites/rgw/multisite-ansible/tasks/test_Mbuckets_with_Nobjects.yaml deleted file mode 100644 index b30d3caf29f..00000000000 --- a/qa/suites/rgw/multisite-ansible/tasks/test_Mbuckets_with_Nobjects.yaml +++ /dev/null @@ -1,47 +0,0 @@ -tasks: -- ssh-keys: null -- ceph-ansible: - vars: - cluster: c1 -- ceph-ansible: - vars: - cluster: c2 -- new-rgw-multisite: - realm: - name: test-realm - is_default: true - zonegroups: - - name: test-zg - is_master: true - is_default: true - zones: - - name: test-zone - is_master: true - is_default: true - endpoints: [c1.rgw.0] - - name: test-zone2 - is_default: true - endpoints: [c2.rgw.1] -- multisite-test.userexec: - master_client: c1.rgw.0 - test_dir_version: v1 - master_config: - cluster_name: c1 - user_count: 3 - target_client: c2.rgw.1 -- sleep: - duration: 60 -- multisite-test: - test-name: test_Mbuckets_with_Nobjects - test_dir_version: v1 - master_client: c1.rgw.0 - target_client: c2.rgw.1 - bucket_count: 5 - objects_count: 5 - min_file_size: 5 - max_file_size: 10 -- sleep: - duration: 60 -- multisite-test.pull-io-info: -- verify-io: - verification_script: read_io_info diff --git a/qa/suites/rgw/multisite-ansible/tasks/test_acls.yaml b/qa/suites/rgw/multisite-ansible/tasks/test_acls.yaml index b0aaa677f7c..8a808a27ee9 100644 --- a/qa/suites/rgw/multisite-ansible/tasks/test_acls.yaml +++ b/qa/suites/rgw/multisite-ansible/tasks/test_acls.yaml @@ -1,11 +1,10 @@ tasks: - ssh-keys: null - ceph-ansible: - vars: - cluster: c1 + cluster: c1 - ceph-ansible: - vars: - cluster: c2 + cluster: c2 +- install.ship_utilities: null - new-rgw-multisite: realm: name: test-realm @@ -22,26 +21,19 @@ tasks: - name: test-zone2 is_default: true endpoints: [c2.rgw.1] -- multisite-test.userexec: - master_client: c1.rgw.0 - test_dir_version: v1 - master_config: - cluster_name: c1 - user_count: 3 - target_client: c2.rgw.1 -- sleep: - duration: 60 +- netem: + clients: [c1.rgw.0] + iface: eno1 + dst_client: c2.rgw.1 + delay_range: [30ms, 100ms] - multisite-test: - test-name: test_acls - test_dir_version: v1 - master_client: c1.rgw.0 - target_client: c2.rgw.1 - target_config: - bucket_count: 5 - objects_count: 10 - min_file_size: 10 - max_file_size: 20 + test_name: test_acls + script_name: test_acls + test_dir_version: v2 + test_client: c1.rgw.0 - sleep: duration: 60 - multisite-test.pull-io-info: +- verify-io: + verification_script: read_io_info diff --git a/qa/suites/rgw/multisite-ansible/tasks/test_acls_all_usrs.yaml b/qa/suites/rgw/multisite-ansible/tasks/test_acls_all_usrs.yaml deleted file mode 100644 index 90223ed5960..00000000000 --- a/qa/suites/rgw/multisite-ansible/tasks/test_acls_all_usrs.yaml +++ /dev/null @@ -1,47 +0,0 @@ -tasks: -- ssh-keys: null -- ceph-ansible: - vars: - cluster: c1 -- ceph-ansible: - vars: - cluster: c2 -- new-rgw-multisite: - realm: - name: test-realm - is_default: true - zonegroups: - - name: test-zg - is_master: true - is_default: true - zones: - - name: test-zone - is_master: true - is_default: true - endpoints: [c1.rgw.0] - - name: test-zone2 - is_default: true - endpoints: [c2.rgw.1] -- multisite-test.userexec: - master_client: c1.rgw.0 - test_dir_version: v1 - master_config: - cluster_name: c1 - user_count: 3 - target_client: c2.rgw.1 -- sleep: - duration: 60 -- multisite-test: - test-name: test_acls_all_usrs - test_dir_version: v1 - master_client: c1.rgw.0 - target_client: c2.rgw.1 - target_config: - bucket_count: 5 - objects_count: 10 - min_file_size: 10 - max_file_size: 20 -- sleep: - duration: 60 -- multisite-test.pull-io-info: - diff --git a/qa/suites/rgw/multisite-ansible/tasks/test_acls_copy_obj.yaml b/qa/suites/rgw/multisite-ansible/tasks/test_acls_copy_obj.yaml deleted file mode 100644 index de63571f0b5..00000000000 --- a/qa/suites/rgw/multisite-ansible/tasks/test_acls_copy_obj.yaml +++ /dev/null @@ -1,45 +0,0 @@ -tasks: -- ssh-keys: null -- ceph-ansible: - vars: - cluster: c1 -- ceph-ansible: - vars: - cluster: c2 -- new-rgw-multisite: - realm: - name: test-realm - is_default: true - zonegroups: - - name: test-zg - is_master: true - is_default: true - zones: - - name: test-zone - is_master: true - is_default: true - endpoints: [c1.rgw.0] - - name: test-zone2 - is_default: true - endpoints: [c2.rgw.1] -- multisite-test.userexec: - master_client: c1.rgw.0 - test_dir_version: v1 - master_config: - cluster_name: c1 - user_count: 3 - target_client: c2.rgw.1 -- sleep: - duration: 60 -- multisite-test: - test-name: test_acls_copy_obj - test_dir_version: v1 - master_client: c1.rgw.0 - target_client: c2.rgw.1 - target_config: - objects_count: 10 - min_file_size: 10 - max_file_size: 20 -- sleep: - duration: 60 -- multisite-test.pull-io-info: diff --git a/qa/suites/rgw/multisite-ansible/tasks/test_acls_reset.yaml b/qa/suites/rgw/multisite-ansible/tasks/test_acls_reset.yaml deleted file mode 100644 index ed307570861..00000000000 --- a/qa/suites/rgw/multisite-ansible/tasks/test_acls_reset.yaml +++ /dev/null @@ -1,46 +0,0 @@ -tasks: -- ssh-keys: null -- ceph-ansible: - vars: - cluster: c1 -- ceph-ansible: - vars: - cluster: c2 -- new-rgw-multisite: - realm: - name: test-realm - is_default: true - zonegroups: - - name: test-zg - is_master: true - is_default: true - zones: - - name: test-zone - is_master: true - is_default: true - endpoints: [c1.rgw.0] - - name: test-zone2 - is_default: true - endpoints: [c2.rgw.1] -- multisite-test.userexec: - master_client: c1.rgw.0 - test_dir_version: v1 - master_config: - cluster_name: c1 - user_count: 3 - target_client: c2.rgw.1 -- sleep: - duration: 60 -- multisite-test: - test-name: test_acls_reset - test_dir_version: v1 - master_client: c1.rgw.0 - target_client: c2.rgw.1 - target_config: - bucket_count: 5 - objects_count: 10 - min_file_size: 10 - max_file_size: 20 -- sleep: - duration: 60 -- multisite-test.pull-io-info: diff --git a/qa/suites/rgw/multisite-ansible/tasks/test_basic_versioning.yaml b/qa/suites/rgw/multisite-ansible/tasks/test_basic_versioning.yaml deleted file mode 100644 index 78d384715dd..00000000000 --- a/qa/suites/rgw/multisite-ansible/tasks/test_basic_versioning.yaml +++ /dev/null @@ -1,49 +0,0 @@ -tasks: -- ssh-keys: null -- ceph-ansible: - vars: - cluster: c1 -- ceph-ansible: - vars: - cluster: c2 -- new-rgw-multisite: - realm: - name: test-realm - is_default: true - zonegroups: - - name: test-zg - is_master: true - is_default: true - zones: - - name: test-zone - is_master: true - is_default: true - endpoints: [c1.rgw.0] - - name: test-zone2 - is_default: true - endpoints: [c2.rgw.1] -- multisite-test.userexec: - master_client: c1.rgw.0 - test_dir_version: v1 - master_config: - cluster_name: c1 - user_count: 3 - target_client: c2.rgw.1 -- sleep: - duration: 60 -- multisite-test: - test-name: test_basic_versioning - test_dir_version: v1 - master_client: c1.rgw.0 - target_client: c2.rgw.1 - target_config: - bucket_count: 5 - objects_count: 10 - version_count: 5 - min_file_size: 10 - max_file_size: 20 -- sleep: - duration: 60 -- multisite-test.pull-io-info: -- verify-io: - verification_script: read_io_info diff --git a/qa/suites/rgw/multisite-ansible/tasks/test_bucket_lifecycle_config_disable.yaml b/qa/suites/rgw/multisite-ansible/tasks/test_bucket_lifecycle_config_disable.yaml new file mode 100644 index 00000000000..e947bc55ced --- /dev/null +++ b/qa/suites/rgw/multisite-ansible/tasks/test_bucket_lifecycle_config_disable.yaml @@ -0,0 +1,38 @@ +tasks: +- ssh-keys: null +- ceph-ansible: + cluster: c1 +- ceph-ansible: + cluster: c2 +- install.ship_utilities: null +- new-rgw-multisite: + realm: + name: test-realm + is_default: true + zonegroups: + - name: test-zg + is_master: true + is_default: true + zones: + - name: test-zone + is_master: true + is_default: true + endpoints: [c1.rgw.0] + - name: test-zone2 + is_default: true + endpoints: [c2.rgw.1] +- netem: + clients: [c1.rgw.0] + iface: eno1 + dst_client: c2.rgw.1 + delay_range: [30ms, 100ms] +- multisite-test: + test_name: test_bucket_lifecycle_config_disable + script_name: test_bucket_lifecycle_config_ops + test_dir_version: v2 + test_client: c1.rgw.0 +- sleep: + duration: 120 +- multisite-test.pull-io-info: +- verify-io: + verification_script: read_io_info diff --git a/qa/suites/rgw/multisite-ansible/tasks/test_bucket_lifecycle_config_modify.yaml b/qa/suites/rgw/multisite-ansible/tasks/test_bucket_lifecycle_config_modify.yaml new file mode 100644 index 00000000000..adaedb67af1 --- /dev/null +++ b/qa/suites/rgw/multisite-ansible/tasks/test_bucket_lifecycle_config_modify.yaml @@ -0,0 +1,38 @@ +tasks: +- ssh-keys: null +- ceph-ansible: + cluster: c1 +- ceph-ansible: + cluster: c2 +- install.ship_utilities: null +- new-rgw-multisite: + realm: + name: test-realm + is_default: true + zonegroups: + - name: test-zg + is_master: true + is_default: true + zones: + - name: test-zone + is_master: true + is_default: true + endpoints: [c1.rgw.0] + - name: test-zone2 + is_default: true + endpoints: [c2.rgw.1] +- netem: + clients: [c1.rgw.0] + iface: eno1 + dst_client: c2.rgw.1 + delay_range: [30ms, 100ms] +- multisite-test: + test_name: test_bucket_lifecycle_config_modify + script_name: test_bucket_lifecycle_config_ops + test_dir_version: v2 + test_client: c1.rgw.0 +- sleep: + duration: 60 +- multisite-test.pull-io-info: +- verify-io: + verification_script: read_io_info diff --git a/qa/suites/rgw/multisite-ansible/tasks/test_bucket_lifecycle_config_read.yaml b/qa/suites/rgw/multisite-ansible/tasks/test_bucket_lifecycle_config_read.yaml new file mode 100644 index 00000000000..072e9adc9ce --- /dev/null +++ b/qa/suites/rgw/multisite-ansible/tasks/test_bucket_lifecycle_config_read.yaml @@ -0,0 +1,38 @@ +tasks: +- ssh-keys: null +- ceph-ansible: + cluster: c1 +- ceph-ansible: + cluster: c2 +- install.ship_utilities: null +- new-rgw-multisite: + realm: + name: test-realm + is_default: true + zonegroups: + - name: test-zg + is_master: true + is_default: true + zones: + - name: test-zone + is_master: true + is_default: true + endpoints: [c1.rgw.0] + - name: test-zone2 + is_default: true + endpoints: [c2.rgw.1] +- netem: + clients: [c1.rgw.0] + iface: eno1 + dst_client: c2.rgw.1 + delay_range: [30ms, 100ms] +- multisite-test: + test_name: test_bucket_lifecycle_config_read + script_name: test_bucket_lifecycle_config_ops + test_dir_version: v2 + test_client: c1.rgw.0 +- sleep: + duration: 120 +- multisite-test.pull-io-info: +- verify-io: + verification_script: read_io_info diff --git a/qa/suites/rgw/multisite-ansible/tasks/test_bucket_lifecycle_config_versioning.yaml b/qa/suites/rgw/multisite-ansible/tasks/test_bucket_lifecycle_config_versioning.yaml new file mode 100644 index 00000000000..0d2aa0b46b4 --- /dev/null +++ b/qa/suites/rgw/multisite-ansible/tasks/test_bucket_lifecycle_config_versioning.yaml @@ -0,0 +1,33 @@ +tasks: +- ssh-keys: null +- ceph-ansible: + cluster: c1 +- ceph-ansible: + cluster: c2 +- install.ship_utilities: null +- new-rgw-multisite: + realm: + name: test-realm + is_default: true + zonegroups: + - name: test-zg + is_master: true + is_default: true + zones: + - name: test-zone + is_master: true + is_default: true + endpoints: [c1.rgw.0] + - name: test-zone2 + is_default: true + endpoints: [c2.rgw.1] +- netem: + clients: [c1.rgw.0] + iface: eno1 + dst_client: c2.rgw.1 + delay_range: [30ms, 100ms] +- multisite-test: + test_name: test_bucket_lifecycle_config_versioning + script_name: test_bucket_lifecycle_config_ops + test_dir_version: v2 + test_client: c1.rgw.0 diff --git a/qa/suites/rgw/multisite-ansible/tasks/test_bucket_policy_delete.yaml b/qa/suites/rgw/multisite-ansible/tasks/test_bucket_policy_delete.yaml new file mode 100644 index 00000000000..80c37caed27 --- /dev/null +++ b/qa/suites/rgw/multisite-ansible/tasks/test_bucket_policy_delete.yaml @@ -0,0 +1,37 @@ +tasks: +- ssh-keys: null +- ceph-ansible: + cluster: c1 +- ceph-ansible: + cluster: c2 +- install.ship_utilities: null +- new-rgw-multisite: + realm: + name: test-realm + is_default: true + zonegroups: + - name: test-zg + is_master: true + is_default: true + zones: + - name: test-zone + is_master: true + is_default: true + endpoints: [c1.rgw.0] + - name: test-zone2 + is_default: true + endpoints: [c2.rgw.1] +- netem: + clients: [c1.rgw.0] + iface: eno1 + dst_client: c2.rgw.1 + delay_range: [30ms, 100ms] +- multisite-test: + test_name: test_bucket_policy_delete + script_name: test_bucket_policy_ops + test_dir_version: v2 + test_client: c1.rgw.0 +- sleep: + duration: 120 +- multisite-test.pull-io-info: + diff --git a/qa/suites/rgw/multisite-ansible/tasks/test_bucket_policy_modify.yaml b/qa/suites/rgw/multisite-ansible/tasks/test_bucket_policy_modify.yaml new file mode 100644 index 00000000000..32a35178452 --- /dev/null +++ b/qa/suites/rgw/multisite-ansible/tasks/test_bucket_policy_modify.yaml @@ -0,0 +1,37 @@ +tasks: +- ssh-keys: null +- ceph-ansible: + cluster: c1 +- ceph-ansible: + cluster: c2 +- install.ship_utilities: null +- new-rgw-multisite: + realm: + name: test-realm + is_default: true + zonegroups: + - name: test-zg + is_master: true + is_default: true + zones: + - name: test-zone + is_master: true + is_default: true + endpoints: [c1.rgw.0] + - name: test-zone2 + is_default: true + endpoints: [c2.rgw.1] +- netem: + clients: [c1.rgw.0] + iface: eno1 + dst_client: c2.rgw.1 + delay_range: [30ms, 100ms] +- multisite-test: + test_name: test_bucket_policy_modify + script_name: test_bucket_policy_ops + test_dir_version: v2 + test_client: c1.rgw.0 +- sleep: + duration: 120 +- multisite-test.pull-io-info: + diff --git a/qa/suites/rgw/multisite-ansible/tasks/test_bucket_policy_replace.yaml b/qa/suites/rgw/multisite-ansible/tasks/test_bucket_policy_replace.yaml new file mode 100644 index 00000000000..e99e3a39013 --- /dev/null +++ b/qa/suites/rgw/multisite-ansible/tasks/test_bucket_policy_replace.yaml @@ -0,0 +1,32 @@ +tasks: +- ssh-keys: null +- ceph-ansible: + cluster: c1 +- ceph-ansible: + cluster: c2 +- install.ship_utilities: null +- new-rgw-multisite: + realm: + name: test-realm + is_default: true + zonegroups: + - name: test-zg + is_master: true + is_default: true + zones: + - name: test-zone + is_master: true + is_default: true + endpoints: [c1.rgw.0] + - name: test-zone2 + is_default: true + endpoints: [c2.rgw.1] +- multisite-test: + test_name: test_bucket_policy_replace + script_name: test_bucket_policy_ops + test_dir_version: v2 + test_client: c1.rgw.0 +- sleep: + duration: 120 +- multisite-test.pull-io-info: + diff --git a/qa/suites/rgw/multisite-ansible/tasks/test_bucket_request_payer.yaml b/qa/suites/rgw/multisite-ansible/tasks/test_bucket_request_payer.yaml new file mode 100644 index 00000000000..75942f6916c --- /dev/null +++ b/qa/suites/rgw/multisite-ansible/tasks/test_bucket_request_payer.yaml @@ -0,0 +1,32 @@ +tasks: +- ssh-keys: null +- ceph-ansible: + cluster: c1 +- ceph-ansible: + cluster: c2 +- install.ship_utilities: null +- new-rgw-multisite: + realm: + name: test-realm + is_default: true + zonegroups: + - name: test-zg + is_master: true + is_default: true + zones: + - name: test-zone + is_master: true + is_default: true + endpoints: [c1.rgw.0] + - name: test-zone2 + is_default: true + endpoints: [c2.rgw.1] +- multisite-test: + test_name: test_bucket_request_payer_download + script_name: test_bucket_request_payer + test_dir_version: v2 + test_client: c1.rgw.0 +- sleep: + duration: 120 +- multisite-test.pull-io-info: + diff --git a/qa/suites/rgw/multisite-ansible/tasks/test_bucket_request_payer_download.yaml b/qa/suites/rgw/multisite-ansible/tasks/test_bucket_request_payer_download.yaml new file mode 100644 index 00000000000..26875593d8a --- /dev/null +++ b/qa/suites/rgw/multisite-ansible/tasks/test_bucket_request_payer_download.yaml @@ -0,0 +1,38 @@ +tasks: +- ssh-keys: null +- ceph-ansible: + cluster: c1 +- ceph-ansible: + cluster: c2 +- install.ship_utilities: null +- new-rgw-multisite: + realm: + name: test-realm + is_default: true + zonegroups: + - name: test-zg + is_master: true + is_default: true + zones: + - name: test-zone + is_master: true + is_default: true + endpoints: [c1.rgw.0] + - name: test-zone2 + is_default: true + endpoints: [c2.rgw.1] +- netem: + clients: [c1.rgw.0] + iface: eno1 + dst_client: c2.rgw.1 + delay_range: [30ms, 100ms] +- multisite-test: + test_name: test_bucket_request_payer_download + script_name: test_bucket_request_payer + test_dir_version: v2 + test_client: c1.rgw.0 +- sleep: + duration: 60 +- multisite-test.pull-io-info: + + diff --git a/qa/suites/rgw/multisite-ansible/tasks/test_bucket_with_delete.yaml b/qa/suites/rgw/multisite-ansible/tasks/test_bucket_with_delete.yaml deleted file mode 100644 index 009bffa33cc..00000000000 --- a/qa/suites/rgw/multisite-ansible/tasks/test_bucket_with_delete.yaml +++ /dev/null @@ -1,48 +0,0 @@ -tasks: -- ssh-keys: null -- ceph-ansible: - vars: - cluster: c1 -- ceph-ansible: - vars: - cluster: c2 -- new-rgw-multisite: - realm: - name: test-realm - is_default: true - zonegroups: - - name: test-zg - is_master: true - is_default: true - zones: - - name: test-zone - is_master: true - is_default: true - endpoints: [c1.rgw.0] - - name: test-zone2 - is_default: true - endpoints: [c2.rgw.1] -- multisite-test.userexec: - master_client: c1.rgw.0 - test_dir_version: v1 - master_config: - cluster_name: c1 - user_count: 3 - target_client: c2.rgw.1 -- sleep: - duration: 60 -- multisite-test: - test-name: test_bucket_with_delete - test_dir_version: v1 - master_client: c1.rgw.0 - target_client: c2.rgw.1 - target_config: - bucket_count: 5 - objects_count: 5 - min_file_size: 5 - max_file_size: 10 -- sleep: - duration: 60 -- multisite-test.pull-io-info: -- verify-io: - verification_script: read_io_info diff --git a/qa/suites/rgw/multisite-ansible/tasks/test_delay.yaml b/qa/suites/rgw/multisite-ansible/tasks/test_delay.yaml index 032c711b988..debd8b09046 100644 --- a/qa/suites/rgw/multisite-ansible/tasks/test_delay.yaml +++ b/qa/suites/rgw/multisite-ansible/tasks/test_delay.yaml @@ -1,11 +1,10 @@ tasks: - ssh-keys: null - ceph-ansible: - vars: - cluster: c1 + cluster: c1 - ceph-ansible: - vars: - cluster: c2 + cluster: c2 +- install.ship_utilities: null - new-rgw-multisite: realm: name: test-realm @@ -24,22 +23,20 @@ tasks: endpoints: [c2.rgw.1] - netem: clients: [c1.rgw.0] + iface: eno1 dst_client: c2.rgw.1 delay: 30ms - multisite-test.userexec: master_client: c1.rgw.0 test_dir_version: v1 master_config: - cluster_name: c1 user_count: 3 - target_client: c2.rgw.1 - sleep: duration: 60 - multisite-test: test-name: test_Mbuckets test_dir_version: v1 - master_client: c1.rgw.0 - target_client: c2.rgw.1 + test_client: c2.rgw.1 bucket_count: 5 - sleep: duration: 60 diff --git a/qa/suites/rgw/multisite-ansible/tasks/test_delay_variable.yaml b/qa/suites/rgw/multisite-ansible/tasks/test_delay_variable.yaml index 14ec8b29753..e7d81923200 100644 --- a/qa/suites/rgw/multisite-ansible/tasks/test_delay_variable.yaml +++ b/qa/suites/rgw/multisite-ansible/tasks/test_delay_variable.yaml @@ -1,11 +1,10 @@ tasks: - ssh-keys: null - ceph-ansible: - vars: - cluster: c1 + cluster: c1 - ceph-ansible: - vars: - cluster: c2 + cluster: c2 +- install.ship_utilities: null - new-rgw-multisite: realm: name: test-realm @@ -24,25 +23,23 @@ tasks: endpoints: [c2.rgw.1] - netem: clients: [c1.rgw.0] + iface: eno1 dst_client: c2.rgw.1 delay_range: [20ms, 40ms] - multisite-test.userexec: master_client: c1.rgw.0 test_dir_version: v1 master_config: - cluster_name: c1 user_count: 3 - target_client: c2.rgw.1 - sleep: duration: 60 - multisite-test: test-name: test_Mbuckets test_dir_version: v1 - master_client: c1.rgw.0 - target_client: c2.rgw.1 + test_client: c2.rgw.1 bucket_count: 5 - sleep: - duration: 60 + duration: 120 - multisite-test.pull-io-info: - verify-io: verification_script: read_io_info \ No newline at end of file diff --git a/qa/suites/rgw/multisite-ansible/tasks/test_delete_key_versions.yaml b/qa/suites/rgw/multisite-ansible/tasks/test_delete_key_versions.yaml deleted file mode 100644 index 917bd6983ae..00000000000 --- a/qa/suites/rgw/multisite-ansible/tasks/test_delete_key_versions.yaml +++ /dev/null @@ -1,49 +0,0 @@ -tasks: -- ssh-keys: null -- ceph-ansible: - vars: - cluster: c1 -- ceph-ansible: - vars: - cluster: c2 -- new-rgw-multisite: - realm: - name: test-realm - is_default: true - zonegroups: - - name: test-zg - is_master: true - is_default: true - zones: - - name: test-zone - is_master: true - is_default: true - endpoints: [c1.rgw.0] - - name: test-zone2 - is_default: true - endpoints: [c2.rgw.1] -- multisite-test.userexec: - master_client: c1.rgw.0 - test_dir_version: v1 - master_config: - cluster_name: c1 - user_count: 3 - target_client: c2.rgw.1 -- sleep: - duration: 60 -- multisite-test: - test-name: test_delete_key_versions - test_dir_version: v1 - master_client: c1.rgw.0 - target_client: c2.rgw.1 - target_config: - bucket_count: 5 - objects_count: 10 - version_count: 5 - min_file_size: 10 - max_file_size: 20 -- sleep: - duration: 60 -- multisite-test.pull-io-info: -- verify-io: - verification_script: read_io_info diff --git a/qa/suites/rgw/multisite-ansible/tasks/test_link_failure.yaml b/qa/suites/rgw/multisite-ansible/tasks/test_link_failure.yaml index e44a80d101e..986387cbf46 100644 --- a/qa/suites/rgw/multisite-ansible/tasks/test_link_failure.yaml +++ b/qa/suites/rgw/multisite-ansible/tasks/test_link_failure.yaml @@ -1,11 +1,10 @@ tasks: - ssh-keys: null - ceph-ansible: - vars: - cluster: c1 + cluster: c1 - ceph-ansible: - vars: - cluster: c2 + cluster: c2 +- install.ship_utilities: null - new-rgw-multisite: realm: name: test-realm @@ -24,25 +23,24 @@ tasks: endpoints: [c2.rgw.1] - netem: clients: [c1.rgw.0] + iface: eno1 dst_client: c2.rgw.1 link_toggle_interval: 10 # no need to mention units. Dafault takes seconds. - multisite-test.userexec: master_client: c1.rgw.0 test_dir_version: v1 master_config: - cluster_name: c1 user_count: 3 - target_client: c2.rgw.1 - sleep: duration: 60 - multisite-test: test-name: test_Mbuckets test_dir_version: v1 - master_client: c1.rgw.0 - target_client: c1.rgw.0 + test_client: c2.rgw.1 bucket_count: 5 - sleep: duration: 60 -- multisite-test.pull-io-info: -- verify-io: - verification_script: read_io_info \ No newline at end of file +#- netem: +# clients: [c1.rgw.0] +# iface: eno1 +# link_recover: true \ No newline at end of file diff --git a/qa/suites/rgw/multisite-ansible/tasks/test_link_recover.yaml b/qa/suites/rgw/multisite-ansible/tasks/test_link_recover.yaml new file mode 100644 index 00000000000..c164eb4b275 --- /dev/null +++ b/qa/suites/rgw/multisite-ansible/tasks/test_link_recover.yaml @@ -0,0 +1,51 @@ +tasks: +- ssh-keys: null +- ceph-ansible: + cluster: c1 +- ceph-ansible: + cluster: c2 +- install.ship_utilities: null +- new-rgw-multisite: + realm: + name: test-realm + is_default: true + zonegroups: + - name: test-zg + is_master: true + is_default: true + zones: + - name: test-zone + is_master: true + is_default: true + endpoints: [c1.rgw.0] + - name: test-zone2 + is_default: true + endpoints: [c2.rgw.1] +- netem: + clients: [c1.rgw.0] + iface: eno1 + dst_client: c2.rgw.1 + link_toggle_interval: 10 # no need to mention units. Dafault takes seconds. +- multisite-test.userexec: + master_client: c1.rgw.0 + test_dir_version: v1 + master_config: + user_count: 3 +- sleep: + duration: 60 +- multisite-test: + test-name: test_Mbuckets + test_dir_version: v1 + test_client: c1.rgw.0 + bucket_count: 5 +#- sleep: +# duration: 60 +#- netem: +# clients: [c1.rgw.0] +# iface: eno1 +# link_recover: true +#- multisite-test: +# test-name: test_Mbuckets +# test_dir_version: v1 +# test_client: c2.rgw.1 +# bucket_count: 5 \ No newline at end of file diff --git a/qa/suites/rgw/multisite-ansible/tasks/test_multipart_upload.yaml b/qa/suites/rgw/multisite-ansible/tasks/test_multipart_upload.yaml deleted file mode 100644 index 6349dd44e86..00000000000 --- a/qa/suites/rgw/multisite-ansible/tasks/test_multipart_upload.yaml +++ /dev/null @@ -1,47 +0,0 @@ -tasks: -- ssh-keys: null -- ceph-ansible: - vars: - cluster: c1 -- ceph-ansible: - vars: - cluster: c2 -- new-rgw-multisite: - realm: - name: test-realm - is_default: true - zonegroups: - - name: test-zg - is_master: true - is_default: true - zones: - - name: test-zone - is_master: true - is_default: true - endpoints: [c1.rgw.0] - - name: test-zone2 - is_default: true - endpoints: [c2.rgw.1] -- multisite-test.userexec: - master_client: c1.rgw.0 - test_dir_version: v1 - master_config: - cluster_name: c1 - user_count: 3 - target_client: c2.rgw.1 -- sleep: - duration: 60 -- multisite-test: - test-name: test_multipart_upload - test_dir_version: v1 - master_client: c1.rgw.0 - target_client: c2.rgw.1 - target_config: - bucket_count: 5 - min_file_size: 5 - max_file_size: 10 -- sleep: - duration: 60 -- multisite-test.pull-io-info: -- verify-io: - verification_script: read_io_info diff --git a/qa/suites/rgw/multisite-ansible/tasks/test_multipart_upload_cancel.yaml b/qa/suites/rgw/multisite-ansible/tasks/test_multipart_upload_cancel.yaml deleted file mode 100644 index eec6c93270b..00000000000 --- a/qa/suites/rgw/multisite-ansible/tasks/test_multipart_upload_cancel.yaml +++ /dev/null @@ -1,48 +0,0 @@ -tasks: -- ssh-keys: null -- ceph-ansible: - vars: - cluster: c1 -- ceph-ansible: - vars: - cluster: c2 -- new-rgw-multisite: - realm: - name: test-realm - is_default: true - zonegroups: - - name: test-zg - is_master: true - is_default: true - zones: - - name: test-zone - is_master: true - is_default: true - endpoints: [c1.rgw.0] - - name: test-zone2 - is_default: true - endpoints: [c2.rgw.1] -- multisite-test.userexec: - master_client: c1.rgw.0 - test_dir_version: v1 - master_config: - cluster_name: c1 - user_count: 3 - target_client: c2.rgw.1 -- sleep: - duration: 60 -- multisite-test: - test-name: test_multipart_upload_cancel - test_dir_version: v1 - master_client: c1.rgw.0 - target_client: c2.rgw.1 - target_config: - bucket_count: 5 - break_at_part_no: 10 - min_file_size: 100 - max_file_size: 200 -- sleep: - duration: 60 -- multisite-test.pull-io-info: -- verify-io: - verification_script: read_io_info diff --git a/qa/suites/rgw/multisite-ansible/tasks/test_multipart_upload_download.yaml b/qa/suites/rgw/multisite-ansible/tasks/test_multipart_upload_download.yaml deleted file mode 100644 index 3d7e808bb4d..00000000000 --- a/qa/suites/rgw/multisite-ansible/tasks/test_multipart_upload_download.yaml +++ /dev/null @@ -1,47 +0,0 @@ -tasks: -- ssh-keys: null -- ceph-ansible: - vars: - cluster: c1 -- ceph-ansible: - vars: - cluster: c2 -- new-rgw-multisite: - realm: - name: test-realm - is_default: true - zonegroups: - - name: test-zg - is_master: true - is_default: true - zones: - - name: test-zone - is_master: true - is_default: true - endpoints: [c1.rgw.0] - - name: test-zone2 - is_default: true - endpoints: [c2.rgw.1] -- multisite-test.userexec: - master_client: c1.rgw.0 - test_dir_version: v1 - master_config: - cluster_name: c1 - user_count: 3 - target_client: c2.rgw.1 -- sleep: - duration: 60 -- multisite-test: - test-name: test_multipart_upload_download - test_dir_version: v1 - master_client: c1.rgw.0 - target_client: c2.rgw.1 - target_config: - bucket_count: 5 - min_file_size: 100 - max_file_size: 200 -- sleep: - duration: 60 -- multisite-test.pull-io-info: -- verify-io: - verification_script: read_io_info diff --git a/qa/suites/rgw/multisite-ansible/tasks/test_storage_policy_s3.yaml b/qa/suites/rgw/multisite-ansible/tasks/test_storage_policy_s3.yaml new file mode 100644 index 00000000000..8ba5bc6ab71 --- /dev/null +++ b/qa/suites/rgw/multisite-ansible/tasks/test_storage_policy_s3.yaml @@ -0,0 +1,39 @@ +tasks: +- ssh-keys: null +- ceph-ansible: + cluster: c1 +- ceph-ansible: + cluster: c2 +- install.ship_utilities: null +- new-rgw-multisite: + realm: + name: test-realm + is_default: true + zonegroups: + - name: test-zg + is_master: true + is_default: true + zones: + - name: test-zone + is_master: true + is_default: true + endpoints: [c1.rgw.0] + - name: test-zone2 + is_default: true + endpoints: [c2.rgw.1] +- netem: + clients: [c1.rgw.0] + iface: eno1 + dst_client: c2.rgw.1 + delay_range: [30ms, 100ms] +- multisite-test: + test_name: test_storage_policy_s3 + script_name: test_storage_policy + test_dir_version: v2 + test_client: c1.rgw.0 +- sleep: + duration: 60 +- multisite-test.pull-io-info: +- verify-io: + verification_script: read_io_info + diff --git a/qa/suites/rgw/multisite-ansible/tasks/test_storage_policy_swift.yaml b/qa/suites/rgw/multisite-ansible/tasks/test_storage_policy_swift.yaml new file mode 100644 index 00000000000..f2b2d51e107 --- /dev/null +++ b/qa/suites/rgw/multisite-ansible/tasks/test_storage_policy_swift.yaml @@ -0,0 +1,39 @@ +tasks: +- ssh-keys: null +- ceph-ansible: + cluster: c1 +- ceph-ansible: + cluster: c2 +- install.ship_utilities: null +- new-rgw-multisite: + realm: + name: test-realm + is_default: true + zonegroups: + - name: test-zg + is_master: true + is_default: true + zones: + - name: test-zone + is_master: true + is_default: true + endpoints: [c1.rgw.0] + - name: test-zone2 + is_default: true + endpoints: [c2.rgw.1] +- netem: + clients: [c1.rgw.0] + iface: eno1 + dst_client: c2.rgw.1 + delay_range: [30ms, 100ms] +- multisite-test: + script_name: test_storage_policy + test_name: test_storage_policy_swift + test_dir_version: v2 + test_client: c1.rgw.0 +- sleep: + duration: 60 +- multisite-test.pull-io-info: +- verify-io: + verification_script: read_io_info + diff --git a/qa/suites/rgw/multisite-ansible/tasks/test_suspend_versioning.yaml b/qa/suites/rgw/multisite-ansible/tasks/test_suspend_versioning.yaml deleted file mode 100644 index 661219fb653..00000000000 --- a/qa/suites/rgw/multisite-ansible/tasks/test_suspend_versioning.yaml +++ /dev/null @@ -1,49 +0,0 @@ -tasks: -- ssh-keys: null -- ceph-ansible: - vars: - cluster: c1 -- ceph-ansible: - vars: - cluster: c2 -- new_rgw_multisite: - realm: - name: test-realm - is_default: true - zonegroups: - - name: test-zg - is_master: true - is_default: true - zones: - - name: test-zone - is_master: true - is_default: true - endpoints: [c1.rgw.0] - - name: test-zone2 - is_default: true - endpoints: [c2.rgw.1] -- multisite-test.userexec: - master_client: c1.rgw.0 - test_dir_version: v1 - master_config: - cluster_name: c1 - user_count: 3 - target_client: c2.rgw.1 -- sleep: - duration: 60 -- multisite-test: - test-name: test_suspend_versioning - test_dir_version: v1 - master_client: c1.rgw.0 - target_client: c2.rgw.1 - target_config: - bucket_count: 5 - objects_count: 10 - version_count: 5 - min_file_size: 10 - max_file_size: 20 -- sleep: - duration: 60 -- multisite-test.pull-io-info: -- verify-io: - verification_script: read_io_info diff --git a/qa/suites/rgw/multisite-ansible/tasks/test_swift_basic_ops.yaml b/qa/suites/rgw/multisite-ansible/tasks/test_swift_basic_ops.yaml new file mode 100644 index 00000000000..56961a508f2 --- /dev/null +++ b/qa/suites/rgw/multisite-ansible/tasks/test_swift_basic_ops.yaml @@ -0,0 +1,33 @@ +tasks: +- ssh-keys: null +- ceph-ansible: + cluster: c1 +- ceph-ansible: + cluster: c2 +- install.ship_utilities: null +- new-rgw-multisite: + realm: + name: test-realm + is_default: true + zonegroups: + - name: test-zg + is_master: true + is_default: true + zones: + - name: test-zone + is_master: true + is_default: true + endpoints: [c1.rgw.0] + - name: test-zone2 + is_default: true + endpoints: [c2.rgw.1] +- multisite-test: + test_name: test_swift_basic_ops + script_name: test_swift_basic_ops + test_dir_version: v2 + test_client: c1.rgw.0 +- sleep: + duration: 120 +- multisite-test.pull-io-info: +- verify-io: + verification_script: read_io_info diff --git a/qa/suites/rgw/multisite-ansible/tasks/test_version_with_revert.yaml b/qa/suites/rgw/multisite-ansible/tasks/test_version_with_revert.yaml deleted file mode 100644 index 8186c44c028..00000000000 --- a/qa/suites/rgw/multisite-ansible/tasks/test_version_with_revert.yaml +++ /dev/null @@ -1,49 +0,0 @@ -tasks: -- ssh-keys: null -- ceph-ansible: - vars: - cluster: c1 -- ceph-ansible: - vars: - cluster: c2 -- new-rgw-multisite: - realm: - name: test-realm - is_default: true - zonegroups: - - name: test-zg - is_master: true - is_default: true - zones: - - name: test-zone - is_master: true - is_default: true - endpoints: [c1.rgw.0] - - name: test-zone2 - is_default: true - endpoints: [c2.rgw.1] -- multisite-test.userexec: - master_client: c1.rgw.0 - test_dir_version: v1 - master_config: - cluster_name: c1 - user_count: 3 - target_client: c2.rgw.1 -- sleep: - duration: 60 -- multisite-test: - test-name: test_version_with_revert - test_dir_version: v1 - master_client: c1.rgw.0 - target_client: c2.rgw.1 - target_config: - bucket_count: 5 - objects_count: 10 - version_count: 5 - min_file_size: 10 - max_file_size: 20 -- sleep: - duration: 60 -- multisite-test.pull-io-info: -- verify-io: - verification_script: read_io_info diff --git a/qa/suites/rgw/multisite-ansible/tasks/test_versioning_enable.yaml b/qa/suites/rgw/multisite-ansible/tasks/test_versioning_enable.yaml new file mode 100644 index 00000000000..7c1dd82555c --- /dev/null +++ b/qa/suites/rgw/multisite-ansible/tasks/test_versioning_enable.yaml @@ -0,0 +1,38 @@ +tasks: +- ssh-keys: null +- ceph-ansible: + cluster: c1 +- ceph-ansible: + cluster: c2 +- install.ship_utilities: null +- new-rgw-multisite: + realm: + name: test-realm + is_default: true + zonegroups: + - name: test-zg + is_master: true + is_default: true + zones: + - name: test-zone + is_master: true + is_default: true + endpoints: [c1.rgw.0] + - name: test-zone2 + is_default: true + endpoints: [c2.rgw.1] +- netem: + clients: [c1.rgw.0] + iface: eno1 + dst_client: c2.rgw.1 + delay_range: [30ms, 100ms] +- multisite-test: + test_name: test_versioning_enable + script_name: test_versioning_with_objects + test_dir_version: v2 + test_client: c1.rgw.0 +- sleep: + duration: 60 +- multisite-test.pull-io-info: +- verify-io: + verification_script: read_io_info diff --git a/qa/suites/rgw/multisite-ansible/tasks/test_versioning_objects_copy.yaml b/qa/suites/rgw/multisite-ansible/tasks/test_versioning_objects_copy.yaml new file mode 100644 index 00000000000..1254cff74c1 --- /dev/null +++ b/qa/suites/rgw/multisite-ansible/tasks/test_versioning_objects_copy.yaml @@ -0,0 +1,39 @@ +tasks: +- ssh-keys: null +- ceph-ansible: + cluster: c1 +- ceph-ansible: + cluster: c2 +- install.ship_utilities: null +- new-rgw-multisite: + realm: + name: test-realm + is_default: true + zonegroups: + - name: test-zg + is_master: true + is_default: true + zones: + - name: test-zone + is_master: true + is_default: true + endpoints: [c1.rgw.0] + - name: test-zone2 + is_default: true + endpoints: [c2.rgw.1] +- netem: + clients: [c1.rgw.0] + iface: eno1 + dst_client: c2.rgw.1 + delay_range: [30ms, 100ms] +- multisite-test: + test_name: test_versioning_objects_copy + script_name: test_versioning_copy_objects + test_dir_version: v2 + test_client: c1.rgw.0 +- sleep: + duration: 120 +- multisite-test.pull-io-info: +- verify-io: + verification_script: read_io_info + diff --git a/qa/suites/rgw/multisite-ansible/tasks/test_versioning_objects_delete.yaml b/qa/suites/rgw/multisite-ansible/tasks/test_versioning_objects_delete.yaml new file mode 100644 index 00000000000..2510d0e635a --- /dev/null +++ b/qa/suites/rgw/multisite-ansible/tasks/test_versioning_objects_delete.yaml @@ -0,0 +1,39 @@ +tasks: +- ssh-keys: null +- ceph-ansible: + cluster: c1 +- ceph-ansible: + cluster: c2 +- install.ship_utilities: null +- new-rgw-multisite: + realm: + name: test-realm + is_default: true + zonegroups: + - name: test-zg + is_master: true + is_default: true + zones: + - name: test-zone + is_master: true + is_default: true + endpoints: [c1.rgw.0] + - name: test-zone2 + is_default: true + endpoints: [c2.rgw.1] +- netem: + clients: [c1.rgw.0] + iface: eno1 + dst_client: c2.rgw.1 + delay_range: [30ms, 100ms] +- multisite-test: + test_name: test_versioning_objects_delete + script_name: test_versioning_with_objects + test_dir_version: v2 + test_client: c1.rgw.0 +- sleep: + duration: 120 +- multisite-test.pull-io-info: +- verify-io: + verification_script: read_io_info + diff --git a/qa/suites/rgw/multisite-ansible/tasks/test_versioning_objects_enable.yaml b/qa/suites/rgw/multisite-ansible/tasks/test_versioning_objects_enable.yaml new file mode 100644 index 00000000000..33a3383362f --- /dev/null +++ b/qa/suites/rgw/multisite-ansible/tasks/test_versioning_objects_enable.yaml @@ -0,0 +1,38 @@ +tasks: +- ssh-keys: null +- ceph-ansible: + cluster: c1 +- ceph-ansible: + cluster: c2 +- install.ship_utilities: null +- new-rgw-multisite: + realm: + name: test-realm + is_default: true + zonegroups: + - name: test-zg + is_master: true + is_default: true + zones: + - name: test-zone + is_master: true + is_default: true + endpoints: [c1.rgw.0] + - name: test-zone2 + is_default: true + endpoints: [c2.rgw.1] +- netem: + clients: [c1.rgw.0] + iface: eno1 + dst_client: c2.rgw.1 + delay_range: [30ms, 100ms] +- multisite-test: + test_name: test_versioning_objects_enable + script_name: test_versioning_with_objects + test_dir_version: v2 + test_client: c1.rgw.0 +- sleep: + duration: 120 +- multisite-test.pull-io-info: +- verify-io: + verification_script: read_io_info \ No newline at end of file diff --git a/qa/suites/rgw/multisite-ansible/tasks/test_versioning_objects_suspend.yaml b/qa/suites/rgw/multisite-ansible/tasks/test_versioning_objects_suspend.yaml new file mode 100644 index 00000000000..f4a458856ce --- /dev/null +++ b/qa/suites/rgw/multisite-ansible/tasks/test_versioning_objects_suspend.yaml @@ -0,0 +1,34 @@ +tasks: +- ssh-keys: null +- ceph-ansible: + cluster: c1 +- ceph-ansible: + cluster: c2 +- install.ship_utilities: null +- new-rgw-multisite: + realm: + name: test-realm + is_default: true + zonegroups: + - name: test-zg + is_master: true + is_default: true + zones: + - name: test-zone + is_master: true + is_default: true + endpoints: [c1.rgw.0] + - name: test-zone2 + is_default: true + endpoints: [c2.rgw.1] +- multisite-test: + test_name: test_versioning_objects_suspend + script_name: test_versioning_with_objects + test_dir_version: v2 + test_client: c1.rgw.0 +- sleep: + duration: 120 +- multisite-test.pull-io-info: +- verify-io: + verification_script: read_io_info + diff --git a/qa/suites/rgw/multisite-ansible/tasks/test_versioning_objects_suspend_reupload.yaml b/qa/suites/rgw/multisite-ansible/tasks/test_versioning_objects_suspend_reupload.yaml new file mode 100644 index 00000000000..544c30cd43f --- /dev/null +++ b/qa/suites/rgw/multisite-ansible/tasks/test_versioning_objects_suspend_reupload.yaml @@ -0,0 +1,33 @@ +tasks: +- ssh-keys: null +- ceph-ansible: + cluster: c1 +- ceph-ansible: + cluster: c2 +- install.ship_utilities: null +- new-rgw-multisite: + realm: + name: test-realm + is_default: true + zonegroups: + - name: test-zg + is_master: true + is_default: true + zones: + - name: test-zone + is_master: true + is_default: true + endpoints: [c1.rgw.0, c1.rgw.1] + - name: test-zone2 + is_default: true + endpoints: [c2.rgw.0, c2.rgw.1] +- multisite-test: + test_name: test_versioning_objects_suspend_re-upload + script_name: test_versioning_with_objects + test_dir_version: v2 + test_client: c1.rgw.0 +- sleep: + duration: 120 +- multisite-test.pull-io-info: +- verify-io: + verification_script: read_io_info