qa/rgw/tempest: rearrange tasks and overrides

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 6fa7167732085d651285a11fd85c1bc33a2afcd7)

Conflicts:
	qa/suites/rgw/tempest/tasks/tempest.yaml version bumped to 2024.1

diff --git a/qa/suites/rgw/tempest/0-install.yaml b/qa/suites/rgw/tempest/0-install.yaml
new file mode 100644 (file)
index 0000000..d67cba6
--- /dev/null
+++ b/qa/suites/rgw/tempest/0-install.yaml
@@ -0,0 +1,15 @@
+tasks:
+- install:
+- ceph:
+- tox: [ client.0 ]
+- keystone:
+    client.0:
+      force-branch: stable/2024.1
+      services:
+        - name: swift
+          type: object-store
+          description: Swift Service
+- rgw:
+    client.0:
+      frontend_prefix: /swift
+      use-keystone-role: client.0

diff --git a/qa/suites/rgw/tempest/overrides.yaml b/qa/suites/rgw/tempest/overrides.yaml
index e7a292ffd1fd94a63456de040daab18175439a9e..9fb0e11e9493de60c1498b252f1fb783e99f49b0 100644 (file)
--- a/qa/suites/rgw/tempest/overrides.yaml
+++ b/qa/suites/rgw/tempest/overrides.yaml
@@ -1,7 +1,21 @@
 overrides:
   ceph:
     conf:
+      global:
+        osd_min_pg_log_entries: 10
+        osd_max_pg_log_entries: 10
       client:
         setuser: ceph
         setgroup: ceph
         debug rgw: 20
+        rgw keystone api version: 3
+        rgw keystone accepted roles: admin,member
+        rgw keystone implicit tenants: true
+        rgw keystone accepted admin roles: admin
+        rgw swift enforce content length: true
+        rgw swift account in url: true
+        rgw swift versioning enabled: true
+        rgw keystone admin domain: Default
+        rgw keystone admin user: admin
+        rgw keystone admin password: ADMIN
+        rgw keystone admin project: admin

diff --git a/qa/suites/rgw/tempest/tasks/rgw_tempest.yaml b/qa/suites/rgw/tempest/tasks/rgw_tempest.yaml
deleted file mode 100644 (file)
index b4b80a3..0000000
--- a/qa/suites/rgw/tempest/tasks/rgw_tempest.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
-tasks:
-- install:
-- ceph:
-- tox: [ client.0 ]
-- keystone:
-    client.0:
-      force-branch: stable/2024.1
-      services:
-        - name: swift
-          type: object-store
-          description: Swift Service
-- rgw:
-    client.0:
-      frontend_prefix: /swift
-      use-keystone-role: client.0
-- tempest:
-    client.0:
-      sha1: 34.1.0
-      force-branch: master
-      use-keystone-role: client.0
-      auth:
-        admin_username: admin
-        admin_project_name: admin
-        admin_password: ADMIN
-        admin_domain_name: Default
-        tempest_roles: admin
-      identity:
-        uri: http://{keystone_public_host}:{keystone_public_port}/v2.0/
-        uri_v3: http://{keystone_public_host}:{keystone_public_port}/v3/
-        auth_version: v3
-        admin_role: admin
-        default_domain_name: Default
-      object-storage:
-        reseller_admin_role: admin
-      object-storage-feature-enabled:
-        container_sync: false
-        discoverability: true
-      blocklist:
-        - .*test_account_quotas_negative.AccountQuotasNegativeTest.test_user_modify_quota
-        - .*test_container_acl_negative.ObjectACLsNegativeTest.*
-        - .*test_container_services_negative.ContainerNegativeTest.test_create_container_metadata_.*
-        - .*test_container_staticweb.StaticWebTest.test_web_index
-        - .*test_container_staticweb.StaticWebTest.test_web_listing_css
-        - .*test_container_synchronization.*
-        - .*test_object_services.PublicObjectTest.test_access_public_container_object_without_using_creds
-        - .*test_object_services.ObjectTest.test_create_object_with_transfer_encoding
-        - .*test_object_expiry.ObjectExpiryTest.test_get_object_after_expiry_time
-        - .*test_object_expiry.ObjectExpiryTest.test_get_object_at_expiry_time
-        - .*test_account_services.AccountTest.test_list_no_account_metadata
-
-overrides:
-  ceph:
-    conf:
-      global:
-        osd_min_pg_log_entries: 10
-        osd_max_pg_log_entries: 10
-      client:
-        rgw keystone api version: 3
-        rgw keystone accepted roles: admin,member
-        rgw keystone implicit tenants: true
-        rgw keystone accepted admin roles: admin
-        rgw swift enforce content length: true
-        rgw swift account in url: true
-        rgw swift versioning enabled: true
-        rgw keystone admin domain: Default
-        rgw keystone admin user: admin
-        rgw keystone admin password: ADMIN
-        rgw keystone admin project: admin

diff --git a/qa/suites/rgw/tempest/tasks/tempest.yaml b/qa/suites/rgw/tempest/tasks/tempest.yaml
new file mode 100644 (file)
index 0000000..29017bc
--- /dev/null
+++ b/qa/suites/rgw/tempest/tasks/tempest.yaml
@@ -0,0 +1,35 @@
+tasks:
+- tempest:
+    client.0:
+      sha1: 34.1.0
+      force-branch: master
+      use-keystone-role: client.0
+      auth:
+        admin_username: admin
+        admin_project_name: admin
+        admin_password: ADMIN
+        admin_domain_name: Default
+        tempest_roles: admin
+      identity:
+        uri: http://{keystone_public_host}:{keystone_public_port}/v2.0/
+        uri_v3: http://{keystone_public_host}:{keystone_public_port}/v3/
+        auth_version: v3
+        admin_role: admin
+        default_domain_name: Default
+      object-storage:
+        reseller_admin_role: admin
+      object-storage-feature-enabled:
+        container_sync: false
+        discoverability: true
+      blocklist:
+        - .*test_account_quotas_negative.AccountQuotasNegativeTest.test_user_modify_quota
+        - .*test_container_acl_negative.ObjectACLsNegativeTest.*
+        - .*test_container_services_negative.ContainerNegativeTest.test_create_container_metadata_.*
+        - .*test_container_staticweb.StaticWebTest.test_web_index
+        - .*test_container_staticweb.StaticWebTest.test_web_listing_css
+        - .*test_container_synchronization.*
+        - .*test_object_services.PublicObjectTest.test_access_public_container_object_without_using_creds
+        - .*test_object_services.ObjectTest.test_create_object_with_transfer_encoding
+        - .*test_object_expiry.ObjectExpiryTest.test_get_object_after_expiry_time
+        - .*test_object_expiry.ObjectExpiryTest.test_get_object_at_expiry_time
+        - .*test_account_services.AccountTest.test_list_no_account_metadata