From: rakesh Date: Thu, 21 Feb 2019 08:18:15 +0000 (+0530) Subject: removed redudant rgw system tasks X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1669765d7a2e5f2e1349c205a6974645d25da414;p=ceph.git removed redudant rgw system tasks --- diff --git a/qa/suites/rgw/system/tasks/Mbuckets_with_Nobjects.yaml b/qa/suites/rgw/system/tasks/Mbuckets_with_Nobjects.yaml index 5e012053443..f9b0d2c9e1f 100644 --- a/qa/suites/rgw/system/tasks/Mbuckets_with_Nobjects.yaml +++ b/qa/suites/rgw/system/tasks/Mbuckets_with_Nobjects.yaml @@ -1,13 +1,25 @@ tasks: -- ssh-keys: null -- ceph-ansible: null -- rgw-system-test: - test: test_Mbuckets_with_Nobjects - test_version: v1 - clients: ['client.0'] - config: - user_count: 2 - bucket_count: 25 - objects_count: 25 - min_file_size: 50 - max_file_size: 60 \ No newline at end of file + - ssh-keys: null + - ceph-ansible: null + - rgw-system-test: + test: Mbuckets_with_Nobjects + script: test_Mbuckets_with_Nobjects.py + clients: ['client.0'] + config: + user_count: 5 + bucket_count: 5 + objects_count: 20 + objects_size_range: + min: 100 + max: 200 + test_ops: + create_bucket: true + create_object: true + download_object: true + delete_bucket_object: true + sharding: + enable: false + max_shards: 0 + compression: + enable: false + type: zlib \ No newline at end of file diff --git a/qa/suites/rgw/system/tasks/Mbuckets_with_Nobjects_multipart.yaml b/qa/suites/rgw/system/tasks/Mbuckets_with_Nobjects_multipart.yaml new file mode 100644 index 00000000000..2270e40e8f0 --- /dev/null +++ b/qa/suites/rgw/system/tasks/Mbuckets_with_Nobjects_multipart.yaml @@ -0,0 +1,26 @@ +tasks: + - ssh-keys: null + - ceph-ansible: null + - rgw-system-test: + test: Mbuckets_with_Nobjects_multipart + script: test_Mbuckets_with_Nobjects.py + clients: ['client.0'] + config: + user_count: 2 + bucket_count: 5 + objects_count: 10 + objects_size_range: + min: 1000 + max: 1500 + test_ops: + create_bucket: true + create_object: true + download_object: true + delete_bucket_object: true + upload_type: multipart + sharding: + enable: false + max_shards: 0 + compression: + enable: false + type: zlib \ No newline at end of file diff --git a/qa/suites/rgw/system/tasks/Mbuckets_with_Nobjects_sharding.yaml b/qa/suites/rgw/system/tasks/Mbuckets_with_Nobjects_sharding.yaml new file mode 100644 index 00000000000..19ef078b8fc --- /dev/null +++ b/qa/suites/rgw/system/tasks/Mbuckets_with_Nobjects_sharding.yaml @@ -0,0 +1,25 @@ +tasks: + - ssh-keys: null + - ceph-ansible: null + - rgw-system-test: + test: Mbuckets_with_Nobjects + script: test_Mbuckets_with_Nobjects.py + clients: ['client.0'] + config: + user_count: 5 + bucket_count: 5 + objects_count: 10 + objects_size_range: + min: 100 + max: 200 + test_ops: + create_bucket: true + create_object: true + download_object: true + delete_bucket_object: true + sharding: + enable: true + max_shards: 32 + compression: + enable: false + type: zlib \ No newline at end of file diff --git a/qa/suites/rgw/system/tasks/Mbuckets_with_Nobjects_shards.yaml b/qa/suites/rgw/system/tasks/Mbuckets_with_Nobjects_shards.yaml deleted file mode 100644 index 2d20db25aac..00000000000 --- a/qa/suites/rgw/system/tasks/Mbuckets_with_Nobjects_shards.yaml +++ /dev/null @@ -1,15 +0,0 @@ -tasks: -- ssh-keys: null -- ceph-ansible: null -- rgw-system-test: - test: test_Mbuckets_with_Nobjects_shards - test_version: v1 - clients: ['client.0'] - config: - shards: 100 - max_objects: 24 # max objects per bucket. - user_count: 2 - bucket_count: 25 - objects_count: 25 - min_file_size: 50 - max_file_size: 60 \ No newline at end of file diff --git a/qa/suites/rgw/system/tasks/acls.yaml b/qa/suites/rgw/system/tasks/acls.yaml index 2c184311c02..be5bf51bdb2 100644 --- a/qa/suites/rgw/system/tasks/acls.yaml +++ b/qa/suites/rgw/system/tasks/acls.yaml @@ -4,10 +4,4 @@ tasks: - rgw-system-test: test: test_acls test_version: v1 - clients: ['client.0'] - config: - user_count: 2 - bucket_count: 25 - objects_count: 25 - min_file_size: 50 - max_file_size: 60 \ No newline at end of file + clients: ['client.0'] \ No newline at end of file diff --git a/qa/suites/rgw/system/tasks/acls_all_usrs.yaml b/qa/suites/rgw/system/tasks/acls_all_usrs.yaml index 3313dc66f7f..aeba96dbc8a 100644 --- a/qa/suites/rgw/system/tasks/acls_all_usrs.yaml +++ b/qa/suites/rgw/system/tasks/acls_all_usrs.yaml @@ -4,10 +4,4 @@ tasks: - rgw-system-test: test: test_acls_all_usrs test_version: v1 - clients: ['client.0'] - config: - bucket_count: 25 - user_count: 2 - objects_count: 25 - min_file_size: 50 - max_file_size: 60 \ No newline at end of file + clients: ['client.0'] \ No newline at end of file diff --git a/qa/suites/rgw/system/tasks/acls_copy_obj.yaml b/qa/suites/rgw/system/tasks/acls_copy_obj.yaml index 0a58326fe03..63a9eb016c8 100644 --- a/qa/suites/rgw/system/tasks/acls_copy_obj.yaml +++ b/qa/suites/rgw/system/tasks/acls_copy_obj.yaml @@ -4,10 +4,4 @@ tasks: - rgw-system-test: test: test_acls_copy_obj test_version: v1 - clients: ['client.0'] - config: - user_count: 2 - bucket_count: 25 - objects_count: 25 - min_file_size: 50 - max_file_size: 60 \ No newline at end of file + clients: ['client.0'] \ No newline at end of file diff --git a/qa/suites/rgw/system/tasks/acls_reset.yaml b/qa/suites/rgw/system/tasks/acls_reset.yaml index d67b3f56fb2..da0803c8d60 100644 --- a/qa/suites/rgw/system/tasks/acls_reset.yaml +++ b/qa/suites/rgw/system/tasks/acls_reset.yaml @@ -4,10 +4,4 @@ tasks: - rgw-system-test: test: test_acls_reset test_version: v1 - clients: ['client.0'] - config: - bucket_count: 25 - user_count: 2 - objects_count: 25 - min_file_size: 50 - max_file_size: 60 \ No newline at end of file + clients: ['client.0'] \ No newline at end of file diff --git a/qa/suites/rgw/system/tasks/basic_versioning.yaml b/qa/suites/rgw/system/tasks/basic_versioning.yaml deleted file mode 100644 index fdf15b02b32..00000000000 --- a/qa/suites/rgw/system/tasks/basic_versioning.yaml +++ /dev/null @@ -1,14 +0,0 @@ -tasks: -- ssh-keys: null -- ceph-ansible: null -- rgw-system-test: - test: test_basic_versioning - test_version: v1 - clients: ['client.0'] - config: - user_count: 2 - bucket_count: 25 - objects_count: 10 - version_count: 5 - min_file_size: 50 - max_file_size: 60 \ No newline at end of file diff --git a/qa/suites/rgw/system/tasks/bucket_with_delete.yaml b/qa/suites/rgw/system/tasks/bucket_with_delete.yaml deleted file mode 100644 index f35fa4d20f5..00000000000 --- a/qa/suites/rgw/system/tasks/bucket_with_delete.yaml +++ /dev/null @@ -1,13 +0,0 @@ -tasks: -- ssh-keys: null -- ceph-ansible: null -- rgw-system-test: - test: test_bucket_with_delete - test_version: v1 - clients: ['client.0'] - config: - user_count: 2 - bucket_count: 25 - objects_count: 10 - min_file_size: 50 - max_file_size: 60 \ No newline at end of file diff --git a/qa/suites/rgw/system/tasks/delete_key_versions.yaml b/qa/suites/rgw/system/tasks/delete_key_versions.yaml deleted file mode 100644 index dd0cc8e5f96..00000000000 --- a/qa/suites/rgw/system/tasks/delete_key_versions.yaml +++ /dev/null @@ -1,14 +0,0 @@ -tasks: -- ssh-keys: null -- ceph-ansible: null -- rgw-system-test: - test: test_delete_key_versions - test_version: v1 - clients: ['client.0'] - config: - user_count: 2 - bucket_count: 25 - objects_count: 10 - version_count: 5 - min_file_size: 50 - max_file_size: 60 \ No newline at end of file diff --git a/qa/suites/rgw/system/tasks/m_bucket.yaml b/qa/suites/rgw/system/tasks/m_bucket.yaml deleted file mode 100644 index 6e9edec2ca4..00000000000 --- a/qa/suites/rgw/system/tasks/m_bucket.yaml +++ /dev/null @@ -1,11 +0,0 @@ -tasks: -- ssh-keys: null -- ceph-ansible: null -- rgw-system-test: - test: test_Mbuckets - test_version: v1 - clients: ['client.0'] - config: - user_count: 25 - bucket_count: 25 - objects_count: 1 # set it 1 though this config is not used. \ No newline at end of file diff --git a/qa/suites/rgw/system/tasks/multipart_upload.yaml b/qa/suites/rgw/system/tasks/multipart_upload.yaml deleted file mode 100644 index 1135bbda3e0..00000000000 --- a/qa/suites/rgw/system/tasks/multipart_upload.yaml +++ /dev/null @@ -1,13 +0,0 @@ -tasks: -- ssh-keys: null -- ceph-ansible: null -- rgw-system-test: - test: test_multipart_upload - test_version: v1 - clients: ['client.0'] - config: - objects_count: 25 - user_count: 2 - bucket_count: 25 - min_file_size: 50 - max_file_size: 60 \ No newline at end of file diff --git a/qa/suites/rgw/system/tasks/multipart_upload_cancel.yaml b/qa/suites/rgw/system/tasks/multipart_upload_cancel.yaml index 7eb8350f01f..eccb85060dc 100644 --- a/qa/suites/rgw/system/tasks/multipart_upload_cancel.yaml +++ b/qa/suites/rgw/system/tasks/multipart_upload_cancel.yaml @@ -4,11 +4,4 @@ tasks: - rgw-system-test: test: test_multipart_upload_cancel test_version: v1 - clients: ['client.0'] - config: - objects_count: 1 - user_count: 1 - bucket_count: 1 - break_at_part_no: 70 - min_file_size: 800 - max_file_size: 1000 \ No newline at end of file + clients: ['client.0'] \ No newline at end of file diff --git a/qa/suites/rgw/system/tasks/multipart_upload_download.yaml b/qa/suites/rgw/system/tasks/multipart_upload_download.yaml deleted file mode 100644 index e07452aa4c4..00000000000 --- a/qa/suites/rgw/system/tasks/multipart_upload_download.yaml +++ /dev/null @@ -1,13 +0,0 @@ -tasks: -- ssh-keys: null -- ceph-ansible: null -- rgw-system-test: - test: test_multipart_upload_download - test_version: v1 - clients: ['client.0'] - config: - objects_count: 1 - user_count: 1 - bucket_count: 1 - min_file_size: 800 - max_file_size: 1000 \ No newline at end of file diff --git a/qa/suites/rgw/system/tasks/suspend_versioning.yaml b/qa/suites/rgw/system/tasks/suspend_versioning.yaml deleted file mode 100644 index 44443119903..00000000000 --- a/qa/suites/rgw/system/tasks/suspend_versioning.yaml +++ /dev/null @@ -1,14 +0,0 @@ -tasks: -- ssh-keys: null -- ceph-ansible: null -- rgw-system-test: - test: test_suspend_versioning - test_version: v1 - clients: ['client.0'] - config: - user_count: 2 - bucket_count: 25 - objects_count: 10 - version_count: 5 - min_file_size: 50 - max_file_size: 60 \ No newline at end of file diff --git a/qa/suites/rgw/system/tasks/version_with_revert.yaml b/qa/suites/rgw/system/tasks/version_with_revert.yaml deleted file mode 100644 index 71d579cdc19..00000000000 --- a/qa/suites/rgw/system/tasks/version_with_revert.yaml +++ /dev/null @@ -1,14 +0,0 @@ -tasks: -- ssh-keys: null -- ceph-ansible: null -- rgw-system-test: - test: test_version_with_revert - test_version: v1 - clients: ['client.0'] - config: - user_count: 2 - bucket_count: 25 - objects_count: 10 - version_count: 5 - min_file_size: 50 - max_file_size: 60 \ No newline at end of file diff --git a/qa/suites/rgw/system/tasks/versioning_delete.yaml b/qa/suites/rgw/system/tasks/versioning_delete.yaml new file mode 100644 index 00000000000..900c0e3f28f --- /dev/null +++ b/qa/suites/rgw/system/tasks/versioning_delete.yaml @@ -0,0 +1,21 @@ +tasks: + - ssh-keys: null + - ceph-ansible: null + - rgw-system-test: + test: versioning_ops + script: test_versioning_with_objects.py + clients: ['client.0'] + config: + user_count: 2 + bucket_count: 2 + objects_count: 10 + version_count: 5 + objects_size_range: + min: 50 + max: 80 + test_ops: + enable_version: true + suspend_version: false + copy_to_version: false + delete_object_versions: true + upload_after_suspend: false \ No newline at end of file diff --git a/qa/suites/rgw/system/tasks/versioning_ops.yaml b/qa/suites/rgw/system/tasks/versioning_ops.yaml new file mode 100644 index 00000000000..d1fa65068a9 --- /dev/null +++ b/qa/suites/rgw/system/tasks/versioning_ops.yaml @@ -0,0 +1,21 @@ +tasks: + - ssh-keys: null + - ceph-ansible: null + - rgw-system-test: + test: versioning_ops + script: test_versioning_with_objects.py + clients: ['client.0'] + config: + user_count: 2 + bucket_count: 2 + objects_count: 10 + version_count: 5 + objects_size_range: + min: 50 + max: 80 + test_ops: + enable_version: true + suspend_version: true + copy_to_version: false + delete_object_versions: false + upload_after_suspend: true \ No newline at end of file