changes to accomodate the modified rgw_system_test task

diff --git a/qa/suites/rgw/system/tasks/Mbuckets_with_Nobjects.yaml b/qa/suites/rgw/system/tasks/Mbuckets_with_Nobjects.yaml
index 72980a96d5480b4084faee80febe641b03b42071..5e0120534435458a47ad593415e3af80d99b272d 100644 (file)
--- a/qa/suites/rgw/system/tasks/Mbuckets_with_Nobjects.yaml
+++ b/qa/suites/rgw/system/tasks/Mbuckets_with_Nobjects.yaml
@@ -2,8 +2,9 @@ tasks:
 - ssh-keys: null
 - ceph-ansible: null
 - rgw-system-test:
-    test-name: test_Mbuckets_with_Nobjects
-    test_dir_version: v1
+    test: test_Mbuckets_with_Nobjects
+    test_version: v1
+    clients: ['client.0']
     config:
       user_count: 2
       bucket_count: 25

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 06b42804ccd34b044e584e668349014b7fc04df0..2d20db25aaca23a52cb728965003e0486033265d 100644 (file)
--- a/qa/suites/rgw/system/tasks/Mbuckets_with_Nobjects_shards.yaml
+++ b/qa/suites/rgw/system/tasks/Mbuckets_with_Nobjects_shards.yaml
@@ -2,8 +2,9 @@ tasks:
 - ssh-keys: null
 - ceph-ansible: null
 - rgw-system-test:
-    test-name: test_Mbuckets_with_Nobjects_shards
-    test_dir_version: v1
+    test: test_Mbuckets_with_Nobjects_shards
+    test_version: v1
+    clients: ['client.0']
     config:
       shards: 100
       max_objects: 24   # max objects per bucket.

diff --git a/qa/suites/rgw/system/tasks/acls.yaml b/qa/suites/rgw/system/tasks/acls.yaml
index 6008bdb44839af0ad3c60e75b67e0cc60614fc3c..2c184311c024a13c650b16a7e1987bc20f416f4d 100644 (file)
--- a/qa/suites/rgw/system/tasks/acls.yaml
+++ b/qa/suites/rgw/system/tasks/acls.yaml
@@ -2,8 +2,9 @@ tasks:
 - ssh-keys: null
 - ceph-ansible: null
 - rgw-system-test:
-   test-name: test_acls
-   test_dir_version: v1
+   test: test_acls
+   test_version: v1
+   clients: ['client.0']
    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 d08456aebbf130d559546d180d8f4b8f94d25720..3313dc66f7f12a4ce8decc5e0f9bb34f24db1750 100644 (file)
--- a/qa/suites/rgw/system/tasks/acls_all_usrs.yaml
+++ b/qa/suites/rgw/system/tasks/acls_all_usrs.yaml
@@ -2,8 +2,9 @@ tasks:
 - ssh-keys: null
 - ceph-ansible: null
 - rgw-system-test:
-    test-name: test_acls_all_usrs
-    test_dir_version: v1
+    test: test_acls_all_usrs
+    test_version: v1
+    clients: ['client.0']
     config:
        bucket_count: 25
        user_count: 2

diff --git a/qa/suites/rgw/system/tasks/acls_copy_obj.yaml b/qa/suites/rgw/system/tasks/acls_copy_obj.yaml
index a12e39dedeca1b5a297d66a6fd5afa7dfc34656a..0a58326fe03b9c4b88b7579f3b07e763c7232bd7 100644 (file)
--- a/qa/suites/rgw/system/tasks/acls_copy_obj.yaml
+++ b/qa/suites/rgw/system/tasks/acls_copy_obj.yaml
@@ -2,8 +2,9 @@ tasks:
 - ssh-keys: null
 - ceph-ansible: null
 - rgw-system-test:
-    test-name: test_acls_copy_obj
-    test_dir_version: v1
+    test: test_acls_copy_obj
+    test_version: v1
+    clients: ['client.0']
     config:
        user_count: 2
        bucket_count: 25

diff --git a/qa/suites/rgw/system/tasks/acls_reset.yaml b/qa/suites/rgw/system/tasks/acls_reset.yaml
index 8ab1cf94b4a8b786666c57ccd3e9801417fd224a..d67b3f56fb2a328a2531e57576c5a6f4fde92d17 100644 (file)
--- a/qa/suites/rgw/system/tasks/acls_reset.yaml
+++ b/qa/suites/rgw/system/tasks/acls_reset.yaml
@@ -2,8 +2,9 @@ tasks:
 - ssh-keys: null
 - ceph-ansible: null
 - rgw-system-test:
-    test-name: test_acls_reset
-    test_dir_version: v1
+    test: test_acls_reset
+    test_version: v1
+    clients: ['client.0']
     config:
        bucket_count: 25
        user_count: 2

diff --git a/qa/suites/rgw/system/tasks/basic_versioning.yaml b/qa/suites/rgw/system/tasks/basic_versioning.yaml
index e0617249dcfd915261d26b728ba4dd764bd44dbc..fdf15b02b32e28eda941fe90a34b084cede12fbb 100644 (file)
--- a/qa/suites/rgw/system/tasks/basic_versioning.yaml
+++ b/qa/suites/rgw/system/tasks/basic_versioning.yaml
@@ -2,8 +2,9 @@ tasks:
 - ssh-keys: null
 - ceph-ansible: null
 - rgw-system-test:
-   test-name: test_basic_versioning
-   test_dir_version: v1
+   test: test_basic_versioning
+   test_version: v1
+   clients: ['client.0']
    config:
        user_count: 2
        bucket_count: 25

diff --git a/qa/suites/rgw/system/tasks/bucket_with_delete.yaml b/qa/suites/rgw/system/tasks/bucket_with_delete.yaml
index e0656bceb31bda80f42f2ff229b245e879f7267d..f35fa4d20f5d4dab9297c589fb6c0dc2f817b837 100644 (file)
--- a/qa/suites/rgw/system/tasks/bucket_with_delete.yaml
+++ b/qa/suites/rgw/system/tasks/bucket_with_delete.yaml
@@ -2,8 +2,9 @@ tasks:
 - ssh-keys: null
 - ceph-ansible: null
 - rgw-system-test:
-    test-name: test_bucket_with_delete
-    test_dir_version: v1
+    test: test_bucket_with_delete
+    test_version: v1
+    clients: ['client.0']
     config:
       user_count: 2
       bucket_count: 25

diff --git a/qa/suites/rgw/system/tasks/delete_key_versions.yaml b/qa/suites/rgw/system/tasks/delete_key_versions.yaml
index 2369b0bf7d9cf1b1baf061a2c79422c875ff1d1d..dd0cc8e5f96b2fef68c63a3ea4ae21af99d0fc1c 100644 (file)
--- a/qa/suites/rgw/system/tasks/delete_key_versions.yaml
+++ b/qa/suites/rgw/system/tasks/delete_key_versions.yaml
@@ -2,8 +2,9 @@ tasks:
 - ssh-keys: null
 - ceph-ansible: null
 - rgw-system-test:
-   test-name: test_delete_key_versions
-   test_dir_version: v1
+   test: test_delete_key_versions
+   test_version: v1
+   clients: ['client.0']
    config:
        user_count: 2
        bucket_count: 25

diff --git a/qa/suites/rgw/system/tasks/m_bucket.yaml b/qa/suites/rgw/system/tasks/m_bucket.yaml
index cd07ac18b9a64a22776a58397782a051ee9c0f86..6e9edec2ca40ebf807ea3661ffb26a0069a0d1cf 100644 (file)
--- a/qa/suites/rgw/system/tasks/m_bucket.yaml
+++ b/qa/suites/rgw/system/tasks/m_bucket.yaml
@@ -2,8 +2,9 @@ tasks:
 - ssh-keys: null
 - ceph-ansible: null
 - rgw-system-test:
-    test-name: test_Mbuckets
-    test_dir_version: v1
+    test: test_Mbuckets
+    test_version: v1
+    clients: ['client.0']
     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 a083ffff60410c087803dc27ffe12d820bb8d505..1135bbda3e0617ecf3220fce7e3b30f14f711431 100644 (file)
--- a/qa/suites/rgw/system/tasks/multipart_upload.yaml
+++ b/qa/suites/rgw/system/tasks/multipart_upload.yaml
@@ -2,8 +2,9 @@ tasks:
 - ssh-keys: null
 - ceph-ansible: null
 - rgw-system-test:
-    test-name: test_multipart_upload
-    test_dir_version: v1
+    test: test_multipart_upload
+    test_version: v1
+    clients: ['client.0']
     config:
        objects_count: 25
        user_count: 2

diff --git a/qa/suites/rgw/system/tasks/multipart_upload_cancel.yaml b/qa/suites/rgw/system/tasks/multipart_upload_cancel.yaml
index 425afb6a893c43a8bedbbc6736421977d04bb7f3..7eb8350f01fabc416353fd662e076eb5d5cce286 100644 (file)
--- a/qa/suites/rgw/system/tasks/multipart_upload_cancel.yaml
+++ b/qa/suites/rgw/system/tasks/multipart_upload_cancel.yaml
@@ -2,8 +2,9 @@ tasks:
 - ssh-keys: null
 - ceph-ansible: null
 - rgw-system-test:
-    test-name: test_multipart_upload_cancel
-    test_dir_version: v1
+    test: test_multipart_upload_cancel
+    test_version: v1
+    clients: ['client.0']
     config:
        objects_count: 1
        user_count: 1

diff --git a/qa/suites/rgw/system/tasks/multipart_upload_download.yaml b/qa/suites/rgw/system/tasks/multipart_upload_download.yaml
index 4da15375ff9d1df39058b71e75840e26a998b547..e07452aa4c48fcac810a9793e1f619673bf3f851 100644 (file)
--- a/qa/suites/rgw/system/tasks/multipart_upload_download.yaml
+++ b/qa/suites/rgw/system/tasks/multipart_upload_download.yaml
@@ -2,8 +2,9 @@ tasks:
 - ssh-keys: null
 - ceph-ansible: null
 - rgw-system-test:
-    test-name: test_multipart_upload_download
-    test_dir_version: v1
+    test: test_multipart_upload_download
+    test_version: v1
+    clients: ['client.0']
     config:
        objects_count: 1
        user_count: 1

diff --git a/qa/suites/rgw/system/tasks/suspend_versioning.yaml b/qa/suites/rgw/system/tasks/suspend_versioning.yaml
index 558aad74ce44c04e3ae96825ad7659bd18b12a11..4444311990360ceb2b24364751d357163d04235a 100644 (file)
--- a/qa/suites/rgw/system/tasks/suspend_versioning.yaml
+++ b/qa/suites/rgw/system/tasks/suspend_versioning.yaml
@@ -2,8 +2,9 @@ tasks:
 - ssh-keys: null
 - ceph-ansible: null
 - rgw-system-test:
-    test-name: test_suspend_versioning
-    test_dir_version: v1
+    test: test_suspend_versioning
+    test_version: v1
+    clients: ['client.0']
     config:
        user_count: 2
        bucket_count: 25

diff --git a/qa/suites/rgw/system/tasks/version_with_revert.yaml b/qa/suites/rgw/system/tasks/version_with_revert.yaml
index 98abcb06b4e378924d0c9b218d43bb4526402e9b..71d579cdc1951fd85620622ac204aee49cb2892f 100644 (file)
--- a/qa/suites/rgw/system/tasks/version_with_revert.yaml
+++ b/qa/suites/rgw/system/tasks/version_with_revert.yaml
@@ -2,8 +2,9 @@ tasks:
 - ssh-keys: null
 - ceph-ansible: null
 - rgw-system-test:
-    test-name: test_version_with_revert
-    test_dir_version: v1
+    test: test_version_with_revert
+    test_version: v1
+    clients: ['client.0']
     config:
        user_count: 2
        bucket_count: 25