From 0c4c3bad8603c3387ceed0034598a281ba6959eb Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Fri, 4 Oct 2024 10:51:01 -0400 Subject: [PATCH] qa/rgw/keystone: run s3tests against both auth orders we've only been testing the default configuration for `rgw_s3_auth_order: sts, external, local`, but local before external should work too. split the s3tests task into two jobs, one for each auth order relates to https://tracker.ceph.com/issues/68393 Signed-off-by: Casey Bodley (cherry picked from commit 0601e565c5c98adf4946b8178e7e7b1efb52a207) --- qa/suites/rgw/tempest/tasks/s3/% | 0 qa/suites/rgw/tempest/tasks/s3/.qa | 1 + qa/suites/rgw/tempest/tasks/s3/auth-order/.qa | 1 + .../rgw/tempest/tasks/s3/auth-order/external-local.yaml | 5 +++++ .../rgw/tempest/tasks/s3/auth-order/local-external.yaml | 5 +++++ qa/suites/rgw/tempest/tasks/{ => s3}/s3tests.yaml | 0 6 files changed, 12 insertions(+) create mode 100644 qa/suites/rgw/tempest/tasks/s3/% create mode 120000 qa/suites/rgw/tempest/tasks/s3/.qa create mode 120000 qa/suites/rgw/tempest/tasks/s3/auth-order/.qa create mode 100644 qa/suites/rgw/tempest/tasks/s3/auth-order/external-local.yaml create mode 100644 qa/suites/rgw/tempest/tasks/s3/auth-order/local-external.yaml rename qa/suites/rgw/tempest/tasks/{ => s3}/s3tests.yaml (100%) diff --git a/qa/suites/rgw/tempest/tasks/s3/% b/qa/suites/rgw/tempest/tasks/s3/% new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/qa/suites/rgw/tempest/tasks/s3/.qa b/qa/suites/rgw/tempest/tasks/s3/.qa new file mode 120000 index 0000000000000..fea2489fdf6d9 --- /dev/null +++ b/qa/suites/rgw/tempest/tasks/s3/.qa @@ -0,0 +1 @@ +../.qa \ No newline at end of file diff --git a/qa/suites/rgw/tempest/tasks/s3/auth-order/.qa b/qa/suites/rgw/tempest/tasks/s3/auth-order/.qa new file mode 120000 index 0000000000000..fea2489fdf6d9 --- /dev/null +++ b/qa/suites/rgw/tempest/tasks/s3/auth-order/.qa @@ -0,0 +1 @@ +../.qa \ No newline at end of file diff --git a/qa/suites/rgw/tempest/tasks/s3/auth-order/external-local.yaml b/qa/suites/rgw/tempest/tasks/s3/auth-order/external-local.yaml new file mode 100644 index 0000000000000..c46a51e0958a0 --- /dev/null +++ b/qa/suites/rgw/tempest/tasks/s3/auth-order/external-local.yaml @@ -0,0 +1,5 @@ +overrides: + ceph: + conf: + client: + rgw s3 auth order: sts, external, local diff --git a/qa/suites/rgw/tempest/tasks/s3/auth-order/local-external.yaml b/qa/suites/rgw/tempest/tasks/s3/auth-order/local-external.yaml new file mode 100644 index 0000000000000..a7b00d00f0b85 --- /dev/null +++ b/qa/suites/rgw/tempest/tasks/s3/auth-order/local-external.yaml @@ -0,0 +1,5 @@ +overrides: + ceph: + conf: + client: + rgw s3 auth order: sts, local, external diff --git a/qa/suites/rgw/tempest/tasks/s3tests.yaml b/qa/suites/rgw/tempest/tasks/s3/s3tests.yaml similarity index 100% rename from qa/suites/rgw/tempest/tasks/s3tests.yaml rename to qa/suites/rgw/tempest/tasks/s3/s3tests.yaml -- 2.39.5