From e6918187568dbd01842d8d1d2c808ce16a894239 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 21 Apr 2024 13:54:28 +0200 Subject: Adding upstream version 18.2.2. Signed-off-by: Daniel Baumann --- qa/suites/rgw/cloud-transition/+ | 0 qa/suites/rgw/cloud-transition/.qa | 1 + qa/suites/rgw/cloud-transition/cluster.yaml | 3 ++ .../cloud-transition/ignore-pg-availability.yaml | 1 + qa/suites/rgw/cloud-transition/overrides.yaml | 14 +++++ qa/suites/rgw/cloud-transition/s3tests-branch.yaml | 1 + .../rgw/cloud-transition/supported-random-distro$ | 1 + qa/suites/rgw/cloud-transition/tasks/.qa | 1 + .../tasks/cloud_transition_s3tests.yaml | 61 ++++++++++++++++++++++ 9 files changed, 83 insertions(+) create mode 100644 qa/suites/rgw/cloud-transition/+ create mode 120000 qa/suites/rgw/cloud-transition/.qa create mode 100644 qa/suites/rgw/cloud-transition/cluster.yaml create mode 120000 qa/suites/rgw/cloud-transition/ignore-pg-availability.yaml create mode 100644 qa/suites/rgw/cloud-transition/overrides.yaml create mode 120000 qa/suites/rgw/cloud-transition/s3tests-branch.yaml create mode 120000 qa/suites/rgw/cloud-transition/supported-random-distro$ create mode 120000 qa/suites/rgw/cloud-transition/tasks/.qa create mode 100644 qa/suites/rgw/cloud-transition/tasks/cloud_transition_s3tests.yaml (limited to 'qa/suites/rgw/cloud-transition') diff --git a/qa/suites/rgw/cloud-transition/+ b/qa/suites/rgw/cloud-transition/+ new file mode 100644 index 000000000..e69de29bb diff --git a/qa/suites/rgw/cloud-transition/.qa b/qa/suites/rgw/cloud-transition/.qa new file mode 120000 index 000000000..a602a0353 --- /dev/null +++ b/qa/suites/rgw/cloud-transition/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/rgw/cloud-transition/cluster.yaml b/qa/suites/rgw/cloud-transition/cluster.yaml new file mode 100644 index 000000000..8e0712ea5 --- /dev/null +++ b/qa/suites/rgw/cloud-transition/cluster.yaml @@ -0,0 +1,3 @@ +roles: +- [mon.a, osd.0, osd.1, osd.2, mgr.0, client.0, client.1] +#- [mon.b, osd.3, osd.4, osd.5, mgr.1, client.2, client.3] diff --git a/qa/suites/rgw/cloud-transition/ignore-pg-availability.yaml b/qa/suites/rgw/cloud-transition/ignore-pg-availability.yaml new file mode 120000 index 000000000..32340b1fa --- /dev/null +++ b/qa/suites/rgw/cloud-transition/ignore-pg-availability.yaml @@ -0,0 +1 @@ +.qa/rgw/ignore-pg-availability.yaml \ No newline at end of file diff --git a/qa/suites/rgw/cloud-transition/overrides.yaml b/qa/suites/rgw/cloud-transition/overrides.yaml new file mode 100644 index 000000000..40ca3556b --- /dev/null +++ b/qa/suites/rgw/cloud-transition/overrides.yaml @@ -0,0 +1,14 @@ +overrides: + ceph: + 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 + frontend: beast diff --git a/qa/suites/rgw/cloud-transition/s3tests-branch.yaml b/qa/suites/rgw/cloud-transition/s3tests-branch.yaml new file mode 120000 index 000000000..bdcaca48a --- /dev/null +++ b/qa/suites/rgw/cloud-transition/s3tests-branch.yaml @@ -0,0 +1 @@ +.qa/rgw/s3tests-branch.yaml \ No newline at end of file diff --git a/qa/suites/rgw/cloud-transition/supported-random-distro$ b/qa/suites/rgw/cloud-transition/supported-random-distro$ new file mode 120000 index 000000000..0862b4457 --- /dev/null +++ b/qa/suites/rgw/cloud-transition/supported-random-distro$ @@ -0,0 +1 @@ +.qa/distros/supported-random-distro$ \ No newline at end of file diff --git a/qa/suites/rgw/cloud-transition/tasks/.qa b/qa/suites/rgw/cloud-transition/tasks/.qa new file mode 120000 index 000000000..a602a0353 --- /dev/null +++ b/qa/suites/rgw/cloud-transition/tasks/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/rgw/cloud-transition/tasks/cloud_transition_s3tests.yaml b/qa/suites/rgw/cloud-transition/tasks/cloud_transition_s3tests.yaml new file mode 100644 index 000000000..756617fba --- /dev/null +++ b/qa/suites/rgw/cloud-transition/tasks/cloud_transition_s3tests.yaml @@ -0,0 +1,61 @@ +tasks: +- install: +- ceph: +- rgw: + storage classes: LUKEWARM, FROZEN + client.0: + port: 8000 + client.1: + port: 8001 + #client.2: + #port: 8002 + #client.3: + #port: 8003 +- rgw-cloudtier: + client.0: + # cloudtier storage class params + # retain_head_object = false + cloud_storage_class: CLOUDTIER-CLIENT0 + cloud_client: client.1 + cloud_regular_storage_class: LUKEWARM + cloud_target_storage_class: FROZEN + cloud_retain_head_object: "false" + cloud_target_path: "teuthology-client0" + cloudtier_user: + # cloud-user creds to be created on cloud-client + cloud_secret: "abcefgh" + cloud_access_key: "12345678" + #client.2: + # cloudtier storage class params + # retain_head_object = true + # + # Having multiple cloudtier storage classes + # in the same task is increasing the transition + # time and resulting in spurious failures. + # Hence disabling this until there is a + # consistent way of running the tests + # without having to depend on lc_debug_interval. + # + #cloud_storage_class: CLOUDTIER-CLIENT2 + #cloud_client: client.3 + #cloud_regular_storage_class: LUKEWARM + #cloud_retain_head_object: "true" + #cloud_target_path: "teuthology-client2" + #cloudtier_user: + # cloud-user creds to be created on cloud-client + #cloud_secret: "foobar" + #cloud_access_key: "87654321" +- tox: [client.0] +- s3tests: + client.0: + rgw_server: client.0 + storage classes: LUKEWARM, FROZEN + extra_attrs: ["cloud_transition"] + lc_debug_interval: 10 + cloudtier_tests: True + #client.2: + #rgw_server: client.2 + #storage classes: LUKEWARM, FROZEN + #extra_attrs: ["cloud_transition"] + #lc_debug_interval: 10 + #cloudtier_tests: True -- cgit v1.2.3