From 06ddecf4c1030e40498c93f9ba3b52d6484dbb68 Mon Sep 17 00:00:00 2001 From: Shilpa Jagannath Date: Fri, 1 Mar 2019 13:05:23 +0530 Subject: [PATCH] Test case yaml organized in suites --- qa/suites/rgw/3way-tests/% | 0 .../rgw/3way-tests/6-node-bluestore.yaml | 35 +++++ qa/suites/rgw/3way-tests/6-node.yaml | 35 +++++ .../rgw/3way-tests/tests/CEPH-10700.yaml | 71 ++++++++++ .../rgw/3way-tests/tests/CEPH-10701.yaml | 124 ++++++++++++++++++ .../rgw/3way-tests/tests/CEPH-10704.yaml | 71 ++++++++++ qa/suites/rgw/haproxy-tests/% | 0 .../clusters/4-node-haproxy.yaml | 35 +++++ .../rgw/haproxy-tests/tasks/CEPH-10117.yaml | 56 ++++++++ .../tasks/CEPH-10120.yaml} | 29 ++-- .../rgw/haproxy-tests/tasks/CEPH-10122.yaml | 64 +++++++++ .../tasks/CEPH-10131.yaml} | 16 +-- .../tasks/CEPH-10140.yaml | 14 +- .../tasks/Mbuckets_with_Nobjects_delete.yaml | 38 ++++++ .../Mbuckets_with_Nobjects_download.yaml | 34 +++++ .../test_Mbuckets_with_Nobjects_basic.yaml | 52 ++++++++ .../tasks/test_basic_versioning.yaml | 20 ++- .../tasks/test_multipart_upload.yaml | 17 +-- .../tasks/test_multipart_upload_cancel.yaml | 8 +- .../tasks/test_multipart_upload_download.yaml | 13 +- .../tasks/test_suspend_versioning.yaml | 18 +-- .../tasks/test_version_with_revert.yaml} | 22 ++-- .../multisite-ansible/clusters/4*3node.yaml | 37 ++++++ .../clusters/4-node-bluestore.yaml | 27 ++++ .../multisite-ansible/clusters/4-node.yaml | 6 +- .../multisite-ansible/tasks/CEPH-10118.yaml | 51 +++---- .../multisite-ansible/tasks/CEPH-10119.yaml | 17 +-- .../tasks/{Mbuckets.yaml => CEPH-10129.yaml} | 48 ++++--- .../multisite-ansible/tasks/CEPH-10141.yaml | 40 +++--- .../multisite-ansible/tasks/CEPH-9532.yaml | 78 +++++++++++ .../tasks/Mbuckets_sharding.yaml | 50 ------- .../tasks/Mbuckets_with_Nobjects_create.yaml | 66 ---------- .../tasks/Mbuckets_with_Nobjects_delete.yaml | 66 ---------- .../Mbuckets_with_Nobjects_download.yaml | 67 ---------- ...=> Mbuckets_with_Nobjects_encryption.yaml} | 36 +++-- .../Mbuckets_with_Nobjects_sharding.yaml | 52 ++------ .../rgw/multisite-ansible/tasks/install.yaml | 23 ++++ .../multisite-ansible/tasks/test_acls.yaml | 36 ++--- .../tasks/test_acls_reset.yaml | 46 ------- .../test_bucket_lifecycle_config_disable.yaml | 38 ++++++ .../test_bucket_lifecycle_config_modify.yaml | 38 ++++++ .../test_bucket_lifecycle_config_read.yaml | 38 ++++++ ...st_bucket_lifecycle_config_versioning.yaml | 33 +++++ .../tasks/test_bucket_policy_delete.yaml | 37 ++++++ .../tasks/test_bucket_policy_modify.yaml | 37 ++++++ .../tasks/test_bucket_policy_replace.yaml | 32 +++++ .../tasks/test_bucket_request_payer.yaml | 32 +++++ .../test_bucket_request_payer_download.yaml | 38 ++++++ .../multisite-ansible/tasks/test_delay.yaml | 13 +- .../tasks/test_delay_variable.yaml | 15 +-- .../tasks/test_delete_key_versions.yaml | 49 ------- .../tasks/test_link_failure.yaml | 20 ++- ...s_all_usrs.yaml => test_link_recover.yaml} | 40 +++--- .../tasks/test_storage_policy_s3.yaml | 39 ++++++ .../tasks/test_storage_policy_swift.yaml | 39 ++++++ .../tasks/test_swift_basic_ops.yaml | 33 +++++ .../tasks/test_version_with_revert.yaml | 49 ------- .../tasks/test_versioning_enable.yaml | 38 ++++++ .../tasks/test_versioning_objects_copy.yaml | 39 ++++++ .../tasks/test_versioning_objects_delete.yaml | 39 ++++++ .../tasks/test_versioning_objects_enable.yaml | 38 ++++++ .../test_versioning_objects_suspend.yaml | 34 +++++ ...t_versioning_objects_suspend_reupload.yaml | 33 +++++ 63 files changed, 1669 insertions(+), 690 deletions(-) create mode 100644 qa/suites/rgw/3way-tests/% create mode 100644 qa/suites/rgw/3way-tests/6-node-bluestore.yaml create mode 100644 qa/suites/rgw/3way-tests/6-node.yaml create mode 100644 qa/suites/rgw/3way-tests/tests/CEPH-10700.yaml create mode 100644 qa/suites/rgw/3way-tests/tests/CEPH-10701.yaml create mode 100644 qa/suites/rgw/3way-tests/tests/CEPH-10704.yaml create mode 100644 qa/suites/rgw/haproxy-tests/% create mode 100644 qa/suites/rgw/haproxy-tests/clusters/4-node-haproxy.yaml create mode 100644 qa/suites/rgw/haproxy-tests/tasks/CEPH-10117.yaml rename qa/suites/rgw/{multisite-ansible/tasks/test_bucket_with_delete.yaml => haproxy-tests/tasks/CEPH-10120.yaml} (63%) create mode 100644 qa/suites/rgw/haproxy-tests/tasks/CEPH-10122.yaml rename qa/suites/rgw/{multisite-ansible/tasks/test_Mbuckets_with_Nobjects.yaml => haproxy-tests/tasks/CEPH-10131.yaml} (77%) rename qa/suites/rgw/{multisite-ansible => haproxy-tests}/tasks/CEPH-10140.yaml (80%) create mode 100644 qa/suites/rgw/haproxy-tests/tasks/Mbuckets_with_Nobjects_delete.yaml create mode 100644 qa/suites/rgw/haproxy-tests/tasks/Mbuckets_with_Nobjects_download.yaml create mode 100644 qa/suites/rgw/haproxy-tests/tasks/test_Mbuckets_with_Nobjects_basic.yaml rename qa/suites/rgw/{multisite-ansible => haproxy-tests}/tasks/test_basic_versioning.yaml (74%) rename qa/suites/rgw/{multisite-ansible => haproxy-tests}/tasks/test_multipart_upload.yaml (77%) rename qa/suites/rgw/{multisite-ansible => haproxy-tests}/tasks/test_multipart_upload_cancel.yaml (87%) rename qa/suites/rgw/{multisite-ansible => haproxy-tests}/tasks/test_multipart_upload_download.yaml (84%) rename qa/suites/rgw/{multisite-ansible => haproxy-tests}/tasks/test_suspend_versioning.yaml (77%) rename qa/suites/rgw/{multisite-ansible/tasks/test_Mbuckets.yaml => haproxy-tests/tasks/test_version_with_revert.yaml} (69%) create mode 100644 qa/suites/rgw/multisite-ansible/clusters/4*3node.yaml create mode 100644 qa/suites/rgw/multisite-ansible/clusters/4-node-bluestore.yaml rename qa/suites/rgw/multisite-ansible/tasks/{Mbuckets.yaml => CEPH-10129.yaml} (51%) create mode 100644 qa/suites/rgw/multisite-ansible/tasks/CEPH-9532.yaml delete mode 100644 qa/suites/rgw/multisite-ansible/tasks/Mbuckets_sharding.yaml delete mode 100644 qa/suites/rgw/multisite-ansible/tasks/Mbuckets_with_Nobjects_create.yaml delete mode 100644 qa/suites/rgw/multisite-ansible/tasks/Mbuckets_with_Nobjects_delete.yaml delete mode 100644 qa/suites/rgw/multisite-ansible/tasks/Mbuckets_with_Nobjects_download.yaml rename qa/suites/rgw/multisite-ansible/tasks/{test_acls_copy_obj.yaml => Mbuckets_with_Nobjects_encryption.yaml} (50%) create mode 100644 qa/suites/rgw/multisite-ansible/tasks/install.yaml delete mode 100644 qa/suites/rgw/multisite-ansible/tasks/test_acls_reset.yaml create mode 100644 qa/suites/rgw/multisite-ansible/tasks/test_bucket_lifecycle_config_disable.yaml create mode 100644 qa/suites/rgw/multisite-ansible/tasks/test_bucket_lifecycle_config_modify.yaml create mode 100644 qa/suites/rgw/multisite-ansible/tasks/test_bucket_lifecycle_config_read.yaml create mode 100644 qa/suites/rgw/multisite-ansible/tasks/test_bucket_lifecycle_config_versioning.yaml create mode 100644 qa/suites/rgw/multisite-ansible/tasks/test_bucket_policy_delete.yaml create mode 100644 qa/suites/rgw/multisite-ansible/tasks/test_bucket_policy_modify.yaml create mode 100644 qa/suites/rgw/multisite-ansible/tasks/test_bucket_policy_replace.yaml create mode 100644 qa/suites/rgw/multisite-ansible/tasks/test_bucket_request_payer.yaml create mode 100644 qa/suites/rgw/multisite-ansible/tasks/test_bucket_request_payer_download.yaml delete mode 100644 qa/suites/rgw/multisite-ansible/tasks/test_delete_key_versions.yaml rename qa/suites/rgw/multisite-ansible/tasks/{test_acls_all_usrs.yaml => test_link_recover.yaml} (54%) create mode 100644 qa/suites/rgw/multisite-ansible/tasks/test_storage_policy_s3.yaml create mode 100644 qa/suites/rgw/multisite-ansible/tasks/test_storage_policy_swift.yaml create mode 100644 qa/suites/rgw/multisite-ansible/tasks/test_swift_basic_ops.yaml delete mode 100644 qa/suites/rgw/multisite-ansible/tasks/test_version_with_revert.yaml create mode 100644 qa/suites/rgw/multisite-ansible/tasks/test_versioning_enable.yaml create mode 100644 qa/suites/rgw/multisite-ansible/tasks/test_versioning_objects_copy.yaml create mode 100644 qa/suites/rgw/multisite-ansible/tasks/test_versioning_objects_delete.yaml create mode 100644 qa/suites/rgw/multisite-ansible/tasks/test_versioning_objects_enable.yaml create mode 100644 qa/suites/rgw/multisite-ansible/tasks/test_versioning_objects_suspend.yaml create mode 100644 qa/suites/rgw/multisite-ansible/tasks/test_versioning_objects_suspend_reupload.yaml diff --git a/qa/suites/rgw/3way-tests/% b/qa/suites/rgw/3way-tests/% new file mode 100644 index 0000000000000..e69de29bb2d1d 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 0000000000000..bee1b3e6e1d95 --- /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 0000000000000..bee1b3e6e1d95 --- /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 0000000000000..12322d1a408ec --- /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 0000000000000..91c34a86f788a --- /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 0000000000000..b79c1d303d36c --- /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 0000000000000..e69de29bb2d1d 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 0000000000000..8f079e8595e24 --- /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 0000000000000..f44a52c32fd14 --- /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/multisite-ansible/tasks/test_bucket_with_delete.yaml b/qa/suites/rgw/haproxy-tests/tasks/CEPH-10120.yaml similarity index 63% rename from qa/suites/rgw/multisite-ansible/tasks/test_bucket_with_delete.yaml rename to qa/suites/rgw/haproxy-tests/tasks/CEPH-10120.yaml index 009bffa33cc07..38445e1d435f5 100644 --- a/qa/suites/rgw/multisite-ansible/tasks/test_bucket_with_delete.yaml +++ b/qa/suites/rgw/haproxy-tests/tasks/CEPH-10120.yaml @@ -1,11 +1,10 @@ tasks: - ssh-keys: null - ceph-ansible: - vars: cluster: c1 - ceph-ansible: - vars: cluster: c2 +- install.ship_utilities: null - new-rgw-multisite: realm: name: test-realm @@ -18,31 +17,39 @@ tasks: - name: test-zone is_master: true is_default: true - endpoints: [c1.rgw.0] + endpoints: [c1.rgw.0, c1.rgw.1] - name: test-zone2 is_default: true - endpoints: [c2.rgw.1] + endpoints: [c2.rgw.0, 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 + link_toggle_interval: 5 # no need to mention units. Dafault takes seconds. +- sleep: + duration: 5 - multisite-test: - test-name: test_bucket_with_delete + test-name: test_multipart_upload test_dir_version: v1 - master_client: c1.rgw.0 - target_client: c2.rgw.1 + test_client: c1.haproxy.0 target_config: bucket_count: 5 - objects_count: 5 min_file_size: 5 max_file_size: 10 - sleep: - duration: 60 + 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 0000000000000..3455bd7c99911 --- /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/multisite-ansible/tasks/test_Mbuckets_with_Nobjects.yaml b/qa/suites/rgw/haproxy-tests/tasks/CEPH-10131.yaml similarity index 77% rename from qa/suites/rgw/multisite-ansible/tasks/test_Mbuckets_with_Nobjects.yaml rename to qa/suites/rgw/haproxy-tests/tasks/CEPH-10131.yaml index b30d3caf29fea..c9f5e54df97f3 100644 --- a/qa/suites/rgw/multisite-ansible/tasks/test_Mbuckets_with_Nobjects.yaml +++ b/qa/suites/rgw/haproxy-tests/tasks/CEPH-10131.yaml @@ -1,11 +1,10 @@ tasks: - ssh-keys: null - ceph-ansible: - vars: cluster: c1 - ceph-ansible: - vars: cluster: c2 +- install.ship_utilities: null - new-rgw-multisite: realm: name: test-realm @@ -18,24 +17,24 @@ tasks: - name: test-zone is_master: true is_default: true - endpoints: [c1.rgw.0] + endpoints: [c1.rgw.0, c1.rgw.1] - name: test-zone2 is_default: true - endpoints: [c2.rgw.1] + endpoints: [c2.rgw.0, 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 +- ceph-ipmi.poweroff: [c1.rgw.1] +- sleep: + duration: 90 - multisite-test: test-name: test_Mbuckets_with_Nobjects test_dir_version: v1 - master_client: c1.rgw.0 - target_client: c2.rgw.1 + test_client: c1.haproxy.0 bucket_count: 5 objects_count: 5 min_file_size: 5 @@ -45,3 +44,4 @@ tasks: - 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/multisite-ansible/tasks/CEPH-10140.yaml b/qa/suites/rgw/haproxy-tests/tasks/CEPH-10140.yaml similarity index 80% rename from qa/suites/rgw/multisite-ansible/tasks/CEPH-10140.yaml rename to qa/suites/rgw/haproxy-tests/tasks/CEPH-10140.yaml index 5317b1e2066ce..6ff8ac6fc2cf0 100644 --- a/qa/suites/rgw/multisite-ansible/tasks/CEPH-10140.yaml +++ b/qa/suites/rgw/haproxy-tests/tasks/CEPH-10140.yaml @@ -1,11 +1,10 @@ tasks: - ssh-keys: null - ceph-ansible: - vars: cluster: c1 - ceph-ansible: - vars: cluster: c2 +- install.ship_utilities: null - new_rgw_multisite: realm: name: test-realm @@ -18,23 +17,20 @@ tasks: - name: test-zone is_master: true is_default: true - endpoints: [c1.rgw.0] + endpoints: [c1.rgw.0, c1.rgw.1] - name: test-zone2 is_default: true is_read_only: true - endpoints: [c2.rgw.1] + endpoints: [c2.rgw.1, c2.rgw.0] - 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 + test_client: c1.haproxy.0 target_config: bucket_count: 2 objects_count: 20 @@ -43,7 +39,7 @@ tasks: test-name: test_Mbuckets_with_Nobjects test_dir_version: v1 - sleep: - duration: 60 + 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 0000000000000..ca7a240991694 --- /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 0000000000000..cf2bf837f66eb --- /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 0000000000000..54e680be9e82b --- /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/multisite-ansible/tasks/test_basic_versioning.yaml b/qa/suites/rgw/haproxy-tests/tasks/test_basic_versioning.yaml similarity index 74% rename from qa/suites/rgw/multisite-ansible/tasks/test_basic_versioning.yaml rename to qa/suites/rgw/haproxy-tests/tasks/test_basic_versioning.yaml index 78d384715ddb2..205cd4313e829 100644 --- a/qa/suites/rgw/multisite-ansible/tasks/test_basic_versioning.yaml +++ b/qa/suites/rgw/haproxy-tests/tasks/test_basic_versioning.yaml @@ -1,11 +1,10 @@ tasks: - ssh-keys: null - ceph-ansible: - vars: cluster: c1 - ceph-ansible: - vars: cluster: c2 +- install.ship_utilities: null - new-rgw-multisite: realm: name: test-realm @@ -18,32 +17,29 @@ tasks: - name: test-zone is_master: true is_default: true - endpoints: [c1.rgw.0] + 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: - 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 + test_client: c2.haproxy.0 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_multipart_upload.yaml b/qa/suites/rgw/haproxy-tests/tasks/test_multipart_upload.yaml similarity index 77% rename from qa/suites/rgw/multisite-ansible/tasks/test_multipart_upload.yaml rename to qa/suites/rgw/haproxy-tests/tasks/test_multipart_upload.yaml index 6349dd44e86e4..7cfcadba066c8 100644 --- a/qa/suites/rgw/multisite-ansible/tasks/test_multipart_upload.yaml +++ b/qa/suites/rgw/haproxy-tests/tasks/test_multipart_upload.yaml @@ -1,11 +1,10 @@ tasks: - ssh-keys: null - ceph-ansible: - vars: cluster: c1 - ceph-ansible: - vars: cluster: c2 +- install.ship_utilities: null - new-rgw-multisite: realm: name: test-realm @@ -18,24 +17,26 @@ tasks: - name: test-zone is_master: true is_default: true - endpoints: [c1.rgw.0] + endpoints: [c1.rgw.0, c1.rgw.1] - name: test-zone2 is_default: true - endpoints: [c2.rgw.1] + 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: - 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 + test_client: c1.haproxy.0 target_config: bucket_count: 5 min_file_size: 5 diff --git a/qa/suites/rgw/multisite-ansible/tasks/test_multipart_upload_cancel.yaml b/qa/suites/rgw/haproxy-tests/tasks/test_multipart_upload_cancel.yaml similarity index 87% rename from qa/suites/rgw/multisite-ansible/tasks/test_multipart_upload_cancel.yaml rename to qa/suites/rgw/haproxy-tests/tasks/test_multipart_upload_cancel.yaml index eec6c93270b8d..aad0718816dbd 100644 --- a/qa/suites/rgw/multisite-ansible/tasks/test_multipart_upload_cancel.yaml +++ b/qa/suites/rgw/haproxy-tests/tasks/test_multipart_upload_cancel.yaml @@ -1,11 +1,10 @@ tasks: - ssh-keys: null - ceph-ansible: - vars: cluster: c1 - ceph-ansible: - vars: cluster: c2 +- install.ship_utilities: null - new-rgw-multisite: realm: name: test-realm @@ -26,16 +25,13 @@ tasks: 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 + test_client: c2.haproxy.0 target_config: bucket_count: 5 break_at_part_no: 10 diff --git a/qa/suites/rgw/multisite-ansible/tasks/test_multipart_upload_download.yaml b/qa/suites/rgw/haproxy-tests/tasks/test_multipart_upload_download.yaml similarity index 84% rename from qa/suites/rgw/multisite-ansible/tasks/test_multipart_upload_download.yaml rename to qa/suites/rgw/haproxy-tests/tasks/test_multipart_upload_download.yaml index 3d7e808bb4d83..b1eff40cebda4 100644 --- a/qa/suites/rgw/multisite-ansible/tasks/test_multipart_upload_download.yaml +++ b/qa/suites/rgw/haproxy-tests/tasks/test_multipart_upload_download.yaml @@ -1,11 +1,10 @@ tasks: - ssh-keys: null - ceph-ansible: - vars: cluster: c1 - ceph-ansible: - vars: cluster: c2 +- install.ship_utilities: null - new-rgw-multisite: realm: name: test-realm @@ -22,20 +21,22 @@ 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 - multisite-test: test-name: test_multipart_upload_download test_dir_version: v1 - master_client: c1.rgw.0 - target_client: c2.rgw.1 + test_client: c2.haproxy.0 target_config: bucket_count: 5 min_file_size: 100 diff --git a/qa/suites/rgw/multisite-ansible/tasks/test_suspend_versioning.yaml b/qa/suites/rgw/haproxy-tests/tasks/test_suspend_versioning.yaml similarity index 77% rename from qa/suites/rgw/multisite-ansible/tasks/test_suspend_versioning.yaml rename to qa/suites/rgw/haproxy-tests/tasks/test_suspend_versioning.yaml index 661219fb65394..4731042d0ab57 100644 --- a/qa/suites/rgw/multisite-ansible/tasks/test_suspend_versioning.yaml +++ b/qa/suites/rgw/haproxy-tests/tasks/test_suspend_versioning.yaml @@ -1,11 +1,10 @@ tasks: - ssh-keys: null - ceph-ansible: - vars: cluster: c1 - ceph-ansible: - vars: cluster: c2 +- install.ship_utilities: null - new_rgw_multisite: realm: name: test-realm @@ -22,28 +21,25 @@ 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 - multisite-test: test-name: test_suspend_versioning test_dir_version: v1 - master_client: c1.rgw.0 - target_client: c2.rgw.1 + test_client: c2.haproxy.0 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_Mbuckets.yaml b/qa/suites/rgw/haproxy-tests/tasks/test_version_with_revert.yaml similarity index 69% rename from qa/suites/rgw/multisite-ansible/tasks/test_Mbuckets.yaml rename to qa/suites/rgw/haproxy-tests/tasks/test_version_with_revert.yaml index 5b9cea0cac826..49c6f254fb474 100644 --- a/qa/suites/rgw/multisite-ansible/tasks/test_Mbuckets.yaml +++ b/qa/suites/rgw/haproxy-tests/tasks/test_version_with_revert.yaml @@ -1,11 +1,10 @@ tasks: - ssh-keys: null - ceph-ansible: - vars: cluster: c1 - ceph-ansible: - vars: cluster: c2 +- install.ship_utilities: null - new-rgw-multisite: realm: name: test-realm @@ -22,23 +21,20 @@ 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 - multisite-test: - test-name: test_Mbuckets + test-name: test_version_with_revert 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 + 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 0000000000000..f16791bc74d96 --- /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 0000000000000..59890cdf38020 --- /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 75ad625583239..ff09451db364b 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 366c0572b78b1..803183f21803b 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 fe987df171e5b..f9c9a3a7c8e06 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/Mbuckets.yaml b/qa/suites/rgw/multisite-ansible/tasks/CEPH-10129.yaml similarity index 51% rename from qa/suites/rgw/multisite-ansible/tasks/Mbuckets.yaml rename to qa/suites/rgw/multisite-ansible/tasks/CEPH-10129.yaml index a9434b98cfd3e..c8b41a714b0f8 100644 --- a/qa/suites/rgw/multisite-ansible/tasks/Mbuckets.yaml +++ b/qa/suites/rgw/multisite-ansible/tasks/CEPH-10129.yaml @@ -1,12 +1,11 @@ tasks: - ssh-keys: null - ceph-ansible: - vars: - cluster: c1 + cluster: c1 - ceph-ansible: - vars: - cluster: c2 -- new-rgw-multisite: + cluster: c2 +- install.ship_utilities: null +- new_rgw_multisite: realm: name: test-realm is_default: true @@ -22,29 +21,38 @@ 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: - test_dir_version: v2 master_client: c1.rgw.0 + test_dir_version: v2 master_config: - cluster_name: c1 user_count: 3 - target_client: c2.rgw.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 +- 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 \ No newline at end of file + 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 2d65f0ec535a8..f5e16fd442029 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 0000000000000..3403da019371f --- /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_sharding.yaml b/qa/suites/rgw/multisite-ansible/tasks/Mbuckets_sharding.yaml deleted file mode 100644 index aaf00dcc2e4d9..0000000000000 --- 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 6bbaec90306a2..0000000000000 --- 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 eecbc651b3099..0000000000000 --- 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 ebe0382c397b6..0000000000000 --- 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/test_acls_copy_obj.yaml b/qa/suites/rgw/multisite-ansible/tasks/Mbuckets_with_Nobjects_encryption.yaml similarity index 50% rename from qa/suites/rgw/multisite-ansible/tasks/test_acls_copy_obj.yaml rename to qa/suites/rgw/multisite-ansible/tasks/Mbuckets_with_Nobjects_encryption.yaml index de63571f0b573..02ebee771dc3e 100644 --- a/qa/suites/rgw/multisite-ansible/tasks/test_acls_copy_obj.yaml +++ b/qa/suites/rgw/multisite-ansible/tasks/Mbuckets_with_Nobjects_encryption.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,24 +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_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 + 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 10a62a3074a90..7e412a1766763 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 0000000000000..f51d61de64866 --- /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_acls.yaml b/qa/suites/rgw/multisite-ansible/tasks/test_acls.yaml index b0aaa677f7c99..8a808a27ee98a 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_reset.yaml b/qa/suites/rgw/multisite-ansible/tasks/test_acls_reset.yaml deleted file mode 100644 index ed30757086175..0000000000000 --- 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_bucket_lifecycle_config_disable.yaml b/qa/suites/rgw/multisite-ansible/tasks/test_bucket_lifecycle_config_disable.yaml new file mode 100644 index 0000000000000..e947bc55cedae --- /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 0000000000000..adaedb67af1d6 --- /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 0000000000000..072e9adc9ce36 --- /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 0000000000000..0d2aa0b46b417 --- /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 0000000000000..80c37caed2742 --- /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 0000000000000..32a351784525e --- /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 0000000000000..e99e3a39013b8 --- /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 0000000000000..75942f6916c8e --- /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 0000000000000..26875593d8ade --- /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_delay.yaml b/qa/suites/rgw/multisite-ansible/tasks/test_delay.yaml index 032c711b9885b..debd8b09046be 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 14ec8b29753ba..e7d8192320082 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 917bd6983ae60..0000000000000 --- 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 e44a80d101e52..986387cbf4663 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_acls_all_usrs.yaml b/qa/suites/rgw/multisite-ansible/tasks/test_link_recover.yaml similarity index 54% rename from qa/suites/rgw/multisite-ansible/tasks/test_acls_all_usrs.yaml rename to qa/suites/rgw/multisite-ansible/tasks/test_link_recover.yaml index 90223ed596029..c164eb4b27558 100644 --- a/qa/suites/rgw/multisite-ansible/tasks/test_acls_all_usrs.yaml +++ b/qa/suites/rgw/multisite-ansible/tasks/test_link_recover.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,31 @@ tasks: - 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: - cluster_name: c1 user_count: 3 - target_client: c2.rgw.1 - sleep: duration: 60 - multisite-test: - test-name: test_acls_all_usrs + test-name: test_Mbuckets 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: - + 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_storage_policy_s3.yaml b/qa/suites/rgw/multisite-ansible/tasks/test_storage_policy_s3.yaml new file mode 100644 index 0000000000000..8ba5bc6ab718a --- /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 0000000000000..f2b2d51e107e8 --- /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_swift_basic_ops.yaml b/qa/suites/rgw/multisite-ansible/tasks/test_swift_basic_ops.yaml new file mode 100644 index 0000000000000..56961a508f243 --- /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 8186c44c028b8..0000000000000 --- 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 0000000000000..7c1dd82555cf3 --- /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 0000000000000..1254cff74c1cc --- /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 0000000000000..2510d0e635a3d --- /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 0000000000000..33a3383362fbe --- /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 0000000000000..f4a458856cece --- /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 0000000000000..544c30cd43f16 --- /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 -- 2.39.5