added test_dir_version as config and corrected config numbers

diff --git a/qa/suites/rgw/system/tasks/Mbuckets_with_Nobjects.yaml b/qa/suites/rgw/system/tasks/Mbuckets_with_Nobjects.yaml
index 05b071bea1a94dd00d70318ca9afe48a99caf6ec..72980a96d5480b4084faee80febe641b03b42071 100644 (file)
--- a/qa/suites/rgw/system/tasks/Mbuckets_with_Nobjects.yaml
+++ b/qa/suites/rgw/system/tasks/Mbuckets_with_Nobjects.yaml
@@ -3,8 +3,9 @@ tasks:
 - ceph-ansible: null
 - rgw-system-test:
     test-name: test_Mbuckets_with_Nobjects
+    test_dir_version: v1
     config:
-      user_count: 25
+      user_count: 2
       bucket_count: 25
       objects_count: 25
       min_file_size: 50

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 2a1f7a213ef217a0e32f137a9a1daf6e2b46dc2f..06b42804ccd34b044e584e668349014b7fc04df0 100644 (file)
--- a/qa/suites/rgw/system/tasks/Mbuckets_with_Nobjects_shards.yaml
+++ b/qa/suites/rgw/system/tasks/Mbuckets_with_Nobjects_shards.yaml
@@ -3,10 +3,11 @@ tasks:
 - ceph-ansible: null
 - rgw-system-test:
     test-name: test_Mbuckets_with_Nobjects_shards
+    test_dir_version: v1
     config:
       shards: 100
       max_objects: 24   # max objects per bucket.
-      user_count: 25
+      user_count: 2
       bucket_count: 25
       objects_count: 25
       min_file_size: 50

diff --git a/qa/suites/rgw/system/tasks/acls.yaml b/qa/suites/rgw/system/tasks/acls.yaml
index f8a7dde8ff666ab558a0d0a84562004149d89bab..6008bdb44839af0ad3c60e75b67e0cc60614fc3c 100644 (file)
--- a/qa/suites/rgw/system/tasks/acls.yaml
+++ b/qa/suites/rgw/system/tasks/acls.yaml
@@ -3,6 +3,7 @@ tasks:
 - ceph-ansible: null
 - rgw-system-test:
    test-name: test_acls
+   test_dir_version: v1
    config:
        user_count: 2
        bucket_count: 25

diff --git a/qa/suites/rgw/system/tasks/acls_all_usrs.yaml b/qa/suites/rgw/system/tasks/acls_all_usrs.yaml
index c3a2cd71da542aada2a081d460a5b3380f7aec97..d08456aebbf130d559546d180d8f4b8f94d25720 100644 (file)
--- a/qa/suites/rgw/system/tasks/acls_all_usrs.yaml
+++ b/qa/suites/rgw/system/tasks/acls_all_usrs.yaml
@@ -3,9 +3,10 @@ tasks:
 - ceph-ansible: null
 - rgw-system-test:
     test-name: test_acls_all_usrs
+    test_dir_version: v1
     config:
        bucket_count: 25
-       user_count: 25
+       user_count: 2
        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 725c5cf0c00b39812db21b108c00b6f2a541b824..a12e39dedeca1b5a297d66a6fd5afa7dfc34656a 100644 (file)
--- a/qa/suites/rgw/system/tasks/acls_copy_obj.yaml
+++ b/qa/suites/rgw/system/tasks/acls_copy_obj.yaml
@@ -3,8 +3,9 @@ tasks:
 - ceph-ansible: null
 - rgw-system-test:
     test-name: test_acls_copy_obj
+    test_dir_version: v1
     config:
-       user_count: 25
+       user_count: 2
        bucket_count: 25
        objects_count: 25
        min_file_size: 50

diff --git a/qa/suites/rgw/system/tasks/acls_reset.yaml b/qa/suites/rgw/system/tasks/acls_reset.yaml
index 23ea12680d1d0bd5c75a0bc4597b1d989177bae8..8ab1cf94b4a8b786666c57ccd3e9801417fd224a 100644 (file)
--- a/qa/suites/rgw/system/tasks/acls_reset.yaml
+++ b/qa/suites/rgw/system/tasks/acls_reset.yaml
@@ -3,9 +3,10 @@ tasks:
 - ceph-ansible: null
 - rgw-system-test:
     test-name: test_acls_reset
+    test_dir_version: v1
     config:
        bucket_count: 25
-       user_count: 25
+       user_count: 2
        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 f18f7730b07489914c1adb612ea6d3ff9b259cc2..e0617249dcfd915261d26b728ba4dd764bd44dbc 100644 (file)
--- a/qa/suites/rgw/system/tasks/basic_versioning.yaml
+++ b/qa/suites/rgw/system/tasks/basic_versioning.yaml
@@ -3,10 +3,11 @@ tasks:
 - ceph-ansible: null
 - rgw-system-test:
    test-name: test_basic_versioning
+   test_dir_version: v1
    config:
-       user_count: 25
+       user_count: 2
        bucket_count: 25
-       objects_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
index 1aae3a1d54545da98ff1059dcd0df2eacb0c1689..e0656bceb31bda80f42f2ff229b245e879f7267d 100644 (file)
--- a/qa/suites/rgw/system/tasks/bucket_with_delete.yaml
+++ b/qa/suites/rgw/system/tasks/bucket_with_delete.yaml
@@ -3,9 +3,10 @@ tasks:
 - ceph-ansible: null
 - rgw-system-test:
     test-name: test_bucket_with_delete
+    test_dir_version: v1
     config:
-      user_count: 25
+      user_count: 2
       bucket_count: 25
-      objects_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
index 8d8df259aefb8b3f6cd21ec407b97e06b09ec219..2369b0bf7d9cf1b1baf061a2c79422c875ff1d1d 100644 (file)
--- a/qa/suites/rgw/system/tasks/delete_key_versions.yaml
+++ b/qa/suites/rgw/system/tasks/delete_key_versions.yaml
@@ -3,10 +3,11 @@ tasks:
 - ceph-ansible: null
 - rgw-system-test:
    test-name: test_delete_key_versions
+   test_dir_version: v1
    config:
-       user_count: 25
+       user_count: 2
        bucket_count: 25
-       objects_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
index 2299fa148008bdd67a0671e0effa27b1b8ba4c83..cd07ac18b9a64a22776a58397782a051ee9c0f86 100644 (file)
--- a/qa/suites/rgw/system/tasks/m_bucket.yaml
+++ b/qa/suites/rgw/system/tasks/m_bucket.yaml
@@ -3,6 +3,7 @@ tasks:
 - ceph-ansible: null
 - rgw-system-test:
     test-name: test_Mbuckets
+    test_dir_version: v1
     config:
       user_count: 25
       bucket_count: 25

diff --git a/qa/suites/rgw/system/tasks/multipart_upload.yaml b/qa/suites/rgw/system/tasks/multipart_upload.yaml
index 0ce5e12ed999d697b3fd00c5d042820b0bb9a91e..a083ffff60410c087803dc27ffe12d820bb8d505 100644 (file)
--- a/qa/suites/rgw/system/tasks/multipart_upload.yaml
+++ b/qa/suites/rgw/system/tasks/multipart_upload.yaml
@@ -3,9 +3,10 @@ tasks:
 - ceph-ansible: null
 - rgw-system-test:
     test-name: test_multipart_upload
+    test_dir_version: v1
     config:
-       objects_count: 2
-       user_count: 25
+       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 b2e250b7154e1940871ce3aaf252a8b1ae39dd83..425afb6a893c43a8bedbbc6736421977d04bb7f3 100644 (file)
--- a/qa/suites/rgw/system/tasks/multipart_upload_cancel.yaml
+++ b/qa/suites/rgw/system/tasks/multipart_upload_cancel.yaml
@@ -3,10 +3,11 @@ tasks:
 - ceph-ansible: null
 - rgw-system-test:
     test-name: test_multipart_upload_cancel
+    test_dir_version: v1
     config:
-       objects_count: 2
-       user_count: 25
-       bucket_count: 25
+       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

diff --git a/qa/suites/rgw/system/tasks/multipart_upload_download.yaml b/qa/suites/rgw/system/tasks/multipart_upload_download.yaml
index 3b46eaaf2b763cf1b49acbd3966133c2696e3615..4da15375ff9d1df39058b71e75840e26a998b547 100644 (file)
--- a/qa/suites/rgw/system/tasks/multipart_upload_download.yaml
+++ b/qa/suites/rgw/system/tasks/multipart_upload_download.yaml
@@ -3,9 +3,10 @@ tasks:
 - ceph-ansible: null
 - rgw-system-test:
     test-name: test_multipart_upload_download
+    test_dir_version: v1
     config:
        objects_count: 1
-       user_count: 25
-       bucket_count: 25
-       min_file_size: 50
-       max_file_size: 60
\ No newline at end of file
+       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
index 37f6625c9dee822f3de1a3aa25baa2bd958681ec..558aad74ce44c04e3ae96825ad7659bd18b12a11 100644 (file)
--- a/qa/suites/rgw/system/tasks/suspend_versioning.yaml
+++ b/qa/suites/rgw/system/tasks/suspend_versioning.yaml
@@ -3,10 +3,11 @@ tasks:
 - ceph-ansible: null
 - rgw-system-test:
     test-name: test_suspend_versioning
+    test_dir_version: v1
     config:
-       user_count: 25
+       user_count: 2
        bucket_count: 25
-       objects_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
index 98f094d80e0598522b0008dc08b781399d6adff3..98abcb06b4e378924d0c9b218d43bb4526402e9b 100644 (file)
--- a/qa/suites/rgw/system/tasks/version_with_revert.yaml
+++ b/qa/suites/rgw/system/tasks/version_with_revert.yaml
@@ -3,10 +3,11 @@ tasks:
 - ceph-ansible: null
 - rgw-system-test:
     test-name: test_version_with_revert
+    test_dir_version: v1
     config:
-       user_count: 25
+       user_count: 2
        bucket_count: 25
-       objects_count: 90
+       objects_count: 10
        version_count: 5
        min_file_size: 50
        max_file_size: 60
\ No newline at end of file