From 6c767cf140d637d2e7a743364fd1f10c9f1e90ec Mon Sep 17 00:00:00 2001 From: Soumya Koduri Date: Fri, 17 Dec 2021 17:02:37 +0530 Subject: [PATCH] rgw/qa: Add test suite for lifecycle cases Execute lifecycle s3-tests in the teuthology test-suite by configuring required storage classes and 'rgw lc debug interval' option. Signed-off-by: Soumya Koduri --- qa/suites/rgw/lifecycle/+ | 0 qa/suites/rgw/lifecycle/.qa | 1 + qa/suites/rgw/lifecycle/cluster.yaml | 9 +++++++++ qa/suites/rgw/lifecycle/overrides.yaml | 14 +++++++++++++ .../rgw/lifecycle/supported-random-distro$ | 1 + .../rgw/lifecycle/tasks/rgw_s3tests.yaml | 20 +++++++++++++++++++ qa/tasks/s3tests.py | 8 ++++++++ 7 files changed, 53 insertions(+) create mode 100644 qa/suites/rgw/lifecycle/+ create mode 120000 qa/suites/rgw/lifecycle/.qa create mode 100644 qa/suites/rgw/lifecycle/cluster.yaml create mode 100644 qa/suites/rgw/lifecycle/overrides.yaml create mode 120000 qa/suites/rgw/lifecycle/supported-random-distro$ create mode 100644 qa/suites/rgw/lifecycle/tasks/rgw_s3tests.yaml diff --git a/qa/suites/rgw/lifecycle/+ b/qa/suites/rgw/lifecycle/+ new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/qa/suites/rgw/lifecycle/.qa b/qa/suites/rgw/lifecycle/.qa new file mode 120000 index 0000000000000..fea2489fdf6d9 --- /dev/null +++ b/qa/suites/rgw/lifecycle/.qa @@ -0,0 +1 @@ +../.qa \ No newline at end of file diff --git a/qa/suites/rgw/lifecycle/cluster.yaml b/qa/suites/rgw/lifecycle/cluster.yaml new file mode 100644 index 0000000000000..0eab7ebadf262 --- /dev/null +++ b/qa/suites/rgw/lifecycle/cluster.yaml @@ -0,0 +1,9 @@ +roles: +- [mon.a, osd.0, osd.1, osd.2, mgr.0, client.0] +openstack: +- volumes: # attached to each instance + count: 1 + size: 10 # GB +overrides: + rgw: + frontend: beast \ No newline at end of file diff --git a/qa/suites/rgw/lifecycle/overrides.yaml b/qa/suites/rgw/lifecycle/overrides.yaml new file mode 100644 index 0000000000000..83722d31252e1 --- /dev/null +++ b/qa/suites/rgw/lifecycle/overrides.yaml @@ -0,0 +1,14 @@ +overrides: + ceph: + wait-for-scrub: false + conf: + client: + setuser: ceph + setgroup: ceph + debug rgw: 20 + rgw crypt s3 kms backend: testing + rgw crypt s3 kms encryption keys: testkey-1=YmluCmJvb3N0CmJvb3N0LWJ1aWxkCmNlcGguY29uZgo= testkey-2=aWIKTWFrZWZpbGUKbWFuCm91dApzcmMKVGVzdGluZwo= + rgw crypt require ssl: false + rgw lc debug interval: 10 + rgw: + storage classes: LUKEWARM, FROZEN diff --git a/qa/suites/rgw/lifecycle/supported-random-distro$ b/qa/suites/rgw/lifecycle/supported-random-distro$ new file mode 120000 index 0000000000000..0862b4457b37a --- /dev/null +++ b/qa/suites/rgw/lifecycle/supported-random-distro$ @@ -0,0 +1 @@ +.qa/distros/supported-random-distro$ \ No newline at end of file diff --git a/qa/suites/rgw/lifecycle/tasks/rgw_s3tests.yaml b/qa/suites/rgw/lifecycle/tasks/rgw_s3tests.yaml new file mode 100644 index 0000000000000..a8ed747c569c7 --- /dev/null +++ b/qa/suites/rgw/lifecycle/tasks/rgw_s3tests.yaml @@ -0,0 +1,20 @@ +tasks: +- install: +- ceph: +- rgw: [client.0] +- s3tests: + client.0: + force-branch: ceph-quincy + rgw_server: client.0 + storage classes: LUKEWARM, FROZEN + extra_attrs: ["lifecycle"] + lc_debug_interval: 10 +overrides: + ceph: + conf: + client: + debug rgw: 20 + rgw lc debug interval: 10 + storage classes: LUKEWARM, FROZEN + rgw: + storage classes: LUKEWARM, FROZEN diff --git a/qa/tasks/s3tests.py b/qa/tasks/s3tests.py index 2465f97d01c7c..bd844c6c1a78d 100644 --- a/qa/tasks/s3tests.py +++ b/qa/tasks/s3tests.py @@ -356,6 +356,14 @@ def configure(ctx, config): if slow_backend: s3tests_conf['fixtures']['slow backend'] = slow_backend + storage_classes = properties.get('storage classes') + if storage_classes: + s3tests_conf['s3 main']['storage_classes'] = storage_classes + + lc_debug_interval = properties.get('lc_debug_interval') + if lc_debug_interval: + s3tests_conf['s3 main']['lc_debug_interval'] = lc_debug_interval + (remote,) = ctx.cluster.only(client).remotes.keys() remote.run( args=[ -- 2.39.5