changed test numbers to a less value

diff --git a/qa/suites/rgw/system/tasks/Mbuckets_with_Nobjects.yaml b/qa/suites/rgw/system/tasks/Mbuckets_with_Nobjects.yaml
index e4dfb278b6c778948772eafcc1a03b4ea1331b00..05b071bea1a94dd00d70318ca9afe48a99caf6ec 100644 (file)
--- 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 f887fb93a8d51c3c386c95a1a5cc8a55b610f698..2a1f7a213ef217a0e32f137a9a1daf6e2b46dc2f 100644 (file)
--- 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 d618763de535c23f14f0fbd7a7017fed97371f61..c1819abc6826e9367d079b62c7a12d5b551a69ee 100644 (file)
--- 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 75d64e485d866997bc28823552270bd5620480ad..c3a2cd71da542aada2a081d460a5b3380f7aec97 100644 (file)
--- 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 ff4c223ccb99a2852b62b5fefe98030a8b4ca059..9fa448df07744371a7da1dcc09acd97fcfade0b9 100644 (file)
--- 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 cfba798282cee543d47c8b74d65321080feaf38b..23ea12680d1d0bd5c75a0bc4597b1d989177bae8 100644 (file)
--- 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 77b165a1f348119a9909630ecfa1b71456cda90b..f18f7730b07489914c1adb612ea6d3ff9b259cc2 100644 (file)
--- 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 44a02fe160179daafbad14379e803ea919604524..1aae3a1d54545da98ff1059dcd0df2eacb0c1689 100644 (file)
--- 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 aa2533bb2956e38840fab49bd77e4de6b91bb6b2..8d8df259aefb8b3f6cd21ec407b97e06b09ec219 100644 (file)
--- 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 35db65507596e0d40d8bfbb77a9bd9de93aa9f9e..dd324583448cd73c90e14f4864262784fcf72e01 100644 (file)
--- 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 3f96fdc34f7f6261c4d99e817f79fdc26ec6a19f..86a3619aa7eeae856c152c0857715e9ea3645d60 100644 (file)
--- 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 b86ee0dfc696389f9cb12e8338a693157d635ffb..311b7eaad8b786728ede542dfc9b0be4f1cb187f 100644 (file)
--- 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 65312ada63b2d642ee6dfb60380d308cdf206946..53df3de5e8345fe86d8bd3de4ecd8fea4f8194f1 100644 (file)
--- 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 54a43cc70243947826b6c9e4783abe5666c6f9a6..37f6625c9dee822f3de1a3aa25baa2bd958681ec 100644 (file)
--- 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 14fe1f1defccce6d0905de458461f154c51d6af7..98f094d80e0598522b0008dc08b781399d6adff3 100644 (file)
--- 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 f262395b8b3a27175324f39f6c937112dbc5bdb2..b67061fd513c134abe4b5d077e10557a336888ff 100644 (file)
--- 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(