From a620d1eca53d378ca4459f5eb6a5c0a0dd3c82a2 Mon Sep 17 00:00:00 2001 From: rakesh Date: Tue, 28 Feb 2017 18:06:05 +0530 Subject: [PATCH] changed test numbers to a less value --- .../rgw/system/tasks/Mbuckets_with_Nobjects.yaml | 10 +++++----- .../system/tasks/Mbuckets_with_Nobjects_shards.yaml | 12 ++++++------ qa/suites/rgw/system/tasks/acls.yaml | 8 ++++---- qa/suites/rgw/system/tasks/acls_all_usrs.yaml | 10 +++++----- qa/suites/rgw/system/tasks/acls_copy_obj.yaml | 6 +++--- qa/suites/rgw/system/tasks/acls_reset.yaml | 10 +++++----- qa/suites/rgw/system/tasks/basic_versioning.yaml | 10 +++++----- qa/suites/rgw/system/tasks/bucket_with_delete.yaml | 10 +++++----- qa/suites/rgw/system/tasks/delete_key_versions.yaml | 10 +++++----- qa/suites/rgw/system/tasks/m_bucket.yaml | 4 ++-- qa/suites/rgw/system/tasks/multipart_upload.yaml | 8 ++++---- .../rgw/system/tasks/multipart_upload_cancel.yaml | 10 +++++----- .../rgw/system/tasks/multipart_upload_download.yaml | 8 ++++---- qa/suites/rgw/system/tasks/suspend_versioning.yaml | 10 +++++----- qa/suites/rgw/system/tasks/version_with_revert.yaml | 8 ++++---- qa/tasks/rgw_system_test.py | 12 +++++++++--- 16 files changed, 76 insertions(+), 70 deletions(-) diff --git a/qa/suites/rgw/system/tasks/Mbuckets_with_Nobjects.yaml b/qa/suites/rgw/system/tasks/Mbuckets_with_Nobjects.yaml index e4dfb278b6c77..05b071bea1a94 100644 --- a/qa/suites/rgw/system/tasks/Mbuckets_with_Nobjects.yaml +++ b/qa/suites/rgw/system/tasks/Mbuckets_with_Nobjects.yaml @@ -4,8 +4,8 @@ tasks: - rgw-system-test: test-name: test_Mbuckets_with_Nobjects config: - user_count: 100 - bucket_count: 500 - objects_count: 100 - min_file_size: 1000 - max_file_size: 1500 \ No newline at end of file + user_count: 25 + 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/Mbuckets_with_Nobjects_shards.yaml b/qa/suites/rgw/system/tasks/Mbuckets_with_Nobjects_shards.yaml index f887fb93a8d51..2a1f7a213ef21 100644 --- a/qa/suites/rgw/system/tasks/Mbuckets_with_Nobjects_shards.yaml +++ b/qa/suites/rgw/system/tasks/Mbuckets_with_Nobjects_shards.yaml @@ -5,9 +5,9 @@ tasks: test-name: test_Mbuckets_with_Nobjects_shards config: shards: 100 - max_objects: 100000 # max objects per bucket. - user_count: 100 - bucket_count: 500 - objects_count: 100 - min_file_size: 1000 - max_file_size: 1500 \ No newline at end of file + max_objects: 24 # max objects per bucket. + user_count: 25 + 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 d618763de535c..c1819abc6826e 100644 --- a/qa/suites/rgw/system/tasks/acls.yaml +++ b/qa/suites/rgw/system/tasks/acls.yaml @@ -4,7 +4,7 @@ tasks: - rgw-system-test: test-name: test_acls config: - bucket_count: 100 - objects_count: 500 - min_file_size: 1000 - max_file_size: 1500 \ No newline at end of file + 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_all_usrs.yaml b/qa/suites/rgw/system/tasks/acls_all_usrs.yaml index 75d64e485d866..c3a2cd71da542 100644 --- a/qa/suites/rgw/system/tasks/acls_all_usrs.yaml +++ b/qa/suites/rgw/system/tasks/acls_all_usrs.yaml @@ -4,8 +4,8 @@ tasks: - rgw-system-test: test-name: test_acls_all_usrs config: - bucket_count: 500 - user_count: 100 - objects_count: 90 - min_file_size: 1000 - max_file_size: 1500 \ No newline at end of file + bucket_count: 25 + user_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_copy_obj.yaml b/qa/suites/rgw/system/tasks/acls_copy_obj.yaml index ff4c223ccb99a..9fa448df07744 100644 --- a/qa/suites/rgw/system/tasks/acls_copy_obj.yaml +++ b/qa/suites/rgw/system/tasks/acls_copy_obj.yaml @@ -4,6 +4,6 @@ tasks: - rgw-system-test: test-name: test_acls_copy_obj config: - objects_count: 500 - min_file_size: 1000 - max_file_size: 1500 \ No newline at end of file + 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_reset.yaml b/qa/suites/rgw/system/tasks/acls_reset.yaml index cfba798282cee..23ea12680d1d0 100644 --- a/qa/suites/rgw/system/tasks/acls_reset.yaml +++ b/qa/suites/rgw/system/tasks/acls_reset.yaml @@ -4,8 +4,8 @@ tasks: - rgw-system-test: test-name: test_acls_reset config: - bucket_count: 500 - user_count: 100 - objects_count: 90 - min_file_size: 1000 - max_file_size: 1500 \ No newline at end of file + bucket_count: 25 + user_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/basic_versioning.yaml b/qa/suites/rgw/system/tasks/basic_versioning.yaml index 77b165a1f3481..f18f7730b0748 100644 --- a/qa/suites/rgw/system/tasks/basic_versioning.yaml +++ b/qa/suites/rgw/system/tasks/basic_versioning.yaml @@ -4,9 +4,9 @@ tasks: - rgw-system-test: test-name: test_basic_versioning config: - user_count: 100 - bucket_count: 500 - objects_count: 90 + user_count: 25 + bucket_count: 25 + objects_count: 25 version_count: 5 - min_file_size: 1000 - max_file_size: 1500 \ No newline at end of file + 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 index 44a02fe160179..1aae3a1d54545 100644 --- a/qa/suites/rgw/system/tasks/bucket_with_delete.yaml +++ b/qa/suites/rgw/system/tasks/bucket_with_delete.yaml @@ -4,8 +4,8 @@ tasks: - rgw-system-test: test-name: test_bucket_with_delete config: - user_count: 100 - bucket_count: 500 - objects_count: 100 - min_file_size: 1000 - max_file_size: 1500 \ No newline at end of file + user_count: 25 + 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/delete_key_versions.yaml b/qa/suites/rgw/system/tasks/delete_key_versions.yaml index aa2533bb2956e..8d8df259aefb8 100644 --- a/qa/suites/rgw/system/tasks/delete_key_versions.yaml +++ b/qa/suites/rgw/system/tasks/delete_key_versions.yaml @@ -4,9 +4,9 @@ tasks: - rgw-system-test: test-name: test_delete_key_versions config: - user_count: 100 - bucket_count: 500 - objects_count: 90 + user_count: 25 + bucket_count: 25 + objects_count: 25 version_count: 5 - min_file_size: 1000 - max_file_size: 1500 \ No newline at end of file + 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 index 35db65507596e..dd324583448cd 100644 --- a/qa/suites/rgw/system/tasks/m_bucket.yaml +++ b/qa/suites/rgw/system/tasks/m_bucket.yaml @@ -4,5 +4,5 @@ tasks: - rgw-system-test: test-name: test_Mbuckets config: - user_count: 100 - bucket_count: 500 + user_count: 25 + bucket_count: 25 \ 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 index 3f96fdc34f7f6..86a3619aa7eea 100644 --- a/qa/suites/rgw/system/tasks/multipart_upload.yaml +++ b/qa/suites/rgw/system/tasks/multipart_upload.yaml @@ -4,7 +4,7 @@ tasks: - rgw-system-test: test-name: test_multipart_upload config: - user_count: 100 - bucket_count: 500 - min_file_size: 1000 - max_file_size: 1500 \ No newline at end of file + user_count: 25 + 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 b86ee0dfc6963..311b7eaad8b78 100644 --- a/qa/suites/rgw/system/tasks/multipart_upload_cancel.yaml +++ b/qa/suites/rgw/system/tasks/multipart_upload_cancel.yaml @@ -4,8 +4,8 @@ tasks: - rgw-system-test: test-name: test_multipart_upload_cancel config: - user_count: 100 - bucket_count: 500 - break_at_part_no: 90 - min_file_size: 1000 - max_file_size: 1500 \ No newline at end of file + user_count: 25 + bucket_count: 25 + break_at_part_no: 70 + min_file_size: 800 + max_file_size: 1000 \ 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 index 65312ada63b2d..53df3de5e8345 100644 --- a/qa/suites/rgw/system/tasks/multipart_upload_download.yaml +++ b/qa/suites/rgw/system/tasks/multipart_upload_download.yaml @@ -4,7 +4,7 @@ tasks: - rgw-system-test: test-name: test_multipart_upload_download config: - user_count: 100 - bucket_count: 500 - min_file_size: 1000 - max_file_size: 1500 \ No newline at end of file + user_count: 25 + 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/suspend_versioning.yaml b/qa/suites/rgw/system/tasks/suspend_versioning.yaml index 54a43cc702439..37f6625c9dee8 100644 --- a/qa/suites/rgw/system/tasks/suspend_versioning.yaml +++ b/qa/suites/rgw/system/tasks/suspend_versioning.yaml @@ -4,9 +4,9 @@ tasks: - rgw-system-test: test-name: test_suspend_versioning config: - user_count: 100 - bucket_count: 500 - objects_count: 90 + user_count: 25 + bucket_count: 25 + objects_count: 25 version_count: 5 - min_file_size: 1000 - max_file_size: 1500 \ No newline at end of file + 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 index 14fe1f1defccc..98f094d80e059 100644 --- a/qa/suites/rgw/system/tasks/version_with_revert.yaml +++ b/qa/suites/rgw/system/tasks/version_with_revert.yaml @@ -4,9 +4,9 @@ tasks: - rgw-system-test: test-name: test_version_with_revert config: - user_count: 100 - bucket_count: 500 + user_count: 25 + bucket_count: 25 objects_count: 90 version_count: 5 - min_file_size: 1000 - max_file_size: 1500 \ No newline at end of file + min_file_size: 50 + max_file_size: 60 \ No newline at end of file diff --git a/qa/tasks/rgw_system_test.py b/qa/tasks/rgw_system_test.py index f262395b8b3a2..b67061fd513c1 100644 --- a/qa/tasks/rgw_system_test.py +++ b/qa/tasks/rgw_system_test.py @@ -4,6 +4,8 @@ import logging from teuthology import misc as teuthology from teuthology.orchestra import run log = logging.getLogger(__name__) +import os +import pwd class Test(object): @@ -18,14 +20,15 @@ class Test(object): log.info('test: %s' % self.script_fname) + temp_yaml_file = self.yaml_fname + "_" + str(os.getpid()) + pwd.getpwuid(os.getuid()).pw_name + if self.configuration is None: assert isinstance(self.configuration, dict), "configuration not given" - clients[0].run(args=['sudo', 'rm', '-f', run.Raw('/tmp/*')], - check_status=False) + data = self.configuration log.info('creating yaml from the config: %s' % data) - local_file = '/tmp/' + self.yaml_fname + local_file = '/tmp/' + temp_yaml_file with open(local_file, 'w') as outfile: outfile.write(yaml.dump(data, default_flow_style=False)) @@ -37,6 +40,9 @@ class Test(object): 'rgw-tests/ceph-qe-scripts/rgw/tests/s3/yamls/']) clients[0].run(args=['cat', 'rgw-tests/ceph-qe-scripts/rgw/tests/s3/yamls/' + self.yaml_fname]) + + clients[0].run(args=['sudo', 'rm', '-f', run.Raw('%s' % local_file)], check_status=False) + clients[0].run( args=[ run.Raw( -- 2.39.5