test/rgw/logging: add bucket logging test suite to teuthology

this is depended with this s3test PR: ceph/s3-tests#576 and the bucket logging PR: ceph#59808 also point to the s3test of bucket logging. this should be reverted before merging. Signed-off-by: Yuval Lifshitz <[email protected]>
yuvalif · Nov 20, 2024 · fbac147 · fbac147
1 parent 9aab8e7
commit fbac147
Show file tree

Hide file tree

Showing 12 changed files with 61 additions and 2 deletions.
diff --git a/qa/rgw/s3tests-branch.yaml b/qa/rgw/s3tests-branch.yaml
@@ -1,4 +1,4 @@
 overrides:
   s3tests:
-    force-branch: ceph-master
-    # git_remote: https://github.com/ceph/
+    force-branch: wip-yuval-bucket-logging 
+    git_remote: https://github.com/yuvalif/
diff --git a/qa/suites/rgw/bucket-logging/% b/qa/suites/rgw/bucket-logging/%
diff --git a/qa/suites/rgw/bucket-logging/.qa b/qa/suites/rgw/bucket-logging/.qa
@@ -0,0 +1 @@
+../.qa/
diff --git a/qa/suites/rgw/bucket-logging/0-install.yaml b/qa/suites/rgw/bucket-logging/0-install.yaml
@@ -0,0 +1,13 @@
+tasks:
+- install:
+- ceph:
+- openssl_keys:
+- rgw: [client.0]
+- tox: [client.0]    
+
+overrides:
+  ceph:
+    conf:
+      global:
+        osd_min_pg_log_entries: 10
+        osd_max_pg_log_entries: 10
diff --git a/qa/suites/rgw/bucket-logging/beast.yaml b/qa/suites/rgw/bucket-logging/beast.yaml
@@ -0,0 +1 @@
+.qa/rgw_frontend/beast.yaml
diff --git a/qa/suites/rgw/bucket-logging/fixed-1.yaml b/qa/suites/rgw/bucket-logging/fixed-1.yaml
@@ -0,0 +1 @@
+.qa/clusters/fixed-1.yaml
diff --git a/qa/suites/rgw/bucket-logging/ignore-pg-availability.yaml b/qa/suites/rgw/bucket-logging/ignore-pg-availability.yaml
@@ -0,0 +1 @@
+.qa/rgw/ignore-pg-availability.yaml
diff --git a/qa/suites/rgw/bucket-logging/overrides.yaml b/qa/suites/rgw/bucket-logging/overrides.yaml
@@ -0,0 +1,10 @@
+overrides:
+  ceph:
+    conf:
+      client:
+        setuser: ceph
+        setgroup: ceph
+        debug rgw: 20
+        rgw bucket logging obj roll time: 5
+  rgw:
+    storage classes: LUKEWARM, FROZEN
diff --git a/qa/suites/rgw/bucket-logging/supported-distros b/qa/suites/rgw/bucket-logging/supported-distros
@@ -0,0 +1 @@
+.qa/distros/supported-random-distro$/
diff --git a/qa/suites/rgw/bucket-logging/tasks/+ b/qa/suites/rgw/bucket-logging/tasks/+
diff --git a/qa/suites/rgw/bucket-logging/tasks/s3tests.yaml b/qa/suites/rgw/bucket-logging/tasks/s3tests.yaml
@@ -0,0 +1,6 @@
+tasks:
+- s3tests:
+    client.0:
+      boto3_extensions: True
+      rgw_server: client.0
+      extra_attrs: ["bucket_logging"]
diff --git a/qa/tasks/s3tests.py b/qa/tasks/s3tests.py
@@ -57,6 +57,20 @@ def download(ctx, config):
                     'git', 'reset', '--hard', sha1,
                     ],
                 )
+        if client_config.get('boto3_extensions'):
+            ctx.cluster.only(client).run(
+                    args=['mkdir',
+                          '-p', 
+                          '/home/ubuntu/.aws/models/s3/2006-03-01/']
+                    )
+            ctx.cluster.only(client).run(
+                    args=['cd', '/home/ubuntu/.aws/models/s3/2006-03-01/',
+                          run.Raw('&&'), 
+                          'cp', 
+                          '{tdir}/ceph/examples/rgw/boto3/service-2.sdk-extras.json'.format(tdir=testdir), 
+                          'service-2.sdk-extras.json']
+                    )
+
     try:
         yield
     finally:
@@ -70,6 +84,17 @@ def download(ctx, config):
                     '{tdir}/s3-tests-{client}'.format(tdir=testdir, client=client),
                     ],
                 )
+            if client_config.get('boto3_extensions'):
+                ctx.cluster.only(client).run(
+                        args=[
+                            'rm', '-rf', '/home/ubuntu/.aws/models/s3/2006-03-01/service-2.sdk-extras.json',
+                            ],
+                        )
+                ctx.cluster.only(client).run(
+                        args=[
+                            'cd', '/home/ubuntu/', run.Raw('&&'), 'rmdir', '-p', '.aws/models/s3/2006-03-01/',
+                            ],
+                        )
 
 
 def _config_user(s3tests_conf, section, user, email):