From bf8737028fea7d7d93cca1d772e780f8bd590ad0 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Wed, 19 Feb 2025 09:17:38 -0500 Subject: [PATCH] qa/rgw: configure 'iam root' accounts outside of rgw/verify the rgw/verify suite configures accounts for some s3test users. in particular, the [iam root] and [iam alt root] users need to specify an account for use in the iam tests. add accounts to these users in all other subsuites (except dbstore which doesn't support accounts) Fixes: https://tracker.ceph.com/issues/70077 Signed-off-by: Casey Bodley --- qa/suites/rgw/bucket-logging/overrides.yaml | 4 ++++ qa/suites/rgw/cloud-transition/overrides.yaml | 4 ++++ qa/suites/rgw/crypt/overrides.yaml | 5 +++++ qa/suites/rgw/lifecycle/overrides.yaml | 4 ++++ qa/suites/rgw/multifs/overrides.yaml | 3 +++ qa/suites/rgw/sts/overrides.yaml | 3 +++ qa/suites/rgw/tempest/tasks/s3/s3tests.yaml | 4 ++++ qa/suites/rgw/thrash/workload/rgw_s3tests.yaml | 4 ++++ qa/suites/rgw/website/overrides.yaml | 3 +++ 9 files changed, 34 insertions(+) create mode 100644 qa/suites/rgw/crypt/overrides.yaml diff --git a/qa/suites/rgw/bucket-logging/overrides.yaml b/qa/suites/rgw/bucket-logging/overrides.yaml index a448a323d363d..ef08f4616c9f2 100644 --- a/qa/suites/rgw/bucket-logging/overrides.yaml +++ b/qa/suites/rgw/bucket-logging/overrides.yaml @@ -8,3 +8,7 @@ overrides: rgw bucket logging obj roll time: 5 rgw: storage classes: LUKEWARM, FROZEN + s3tests: + accounts: + iam root: RGW88888888888888888 + iam alt root: RGW99999999999999999 diff --git a/qa/suites/rgw/cloud-transition/overrides.yaml b/qa/suites/rgw/cloud-transition/overrides.yaml index 1169ccf1fff6a..c0e021e71594e 100644 --- a/qa/suites/rgw/cloud-transition/overrides.yaml +++ b/qa/suites/rgw/cloud-transition/overrides.yaml @@ -14,3 +14,7 @@ overrides: rgw: storage classes: LUKEWARM, FROZEN frontend: beast + s3tests: + accounts: + iam root: RGW88888888888888888 + iam alt root: RGW99999999999999999 diff --git a/qa/suites/rgw/crypt/overrides.yaml b/qa/suites/rgw/crypt/overrides.yaml new file mode 100644 index 0000000000000..98275f83aacb2 --- /dev/null +++ b/qa/suites/rgw/crypt/overrides.yaml @@ -0,0 +1,5 @@ +overrides: + s3tests: + accounts: + iam root: RGW88888888888888888 + iam alt root: RGW99999999999999999 diff --git a/qa/suites/rgw/lifecycle/overrides.yaml b/qa/suites/rgw/lifecycle/overrides.yaml index 05478e9e32fa3..57c376e9dc1fc 100644 --- a/qa/suites/rgw/lifecycle/overrides.yaml +++ b/qa/suites/rgw/lifecycle/overrides.yaml @@ -13,3 +13,7 @@ overrides: rgw lc debug interval: 10 rgw: storage classes: LUKEWARM, FROZEN + s3tests: + accounts: + iam root: RGW88888888888888888 + iam alt root: RGW99999999999999999 diff --git a/qa/suites/rgw/multifs/overrides.yaml b/qa/suites/rgw/multifs/overrides.yaml index dfca36f782768..708862b113a56 100644 --- a/qa/suites/rgw/multifs/overrides.yaml +++ b/qa/suites/rgw/multifs/overrides.yaml @@ -14,3 +14,6 @@ overrides: storage classes: LUKEWARM, FROZEN s3tests: storage classes: LUKEWARM, FROZEN + accounts: + iam root: RGW88888888888888888 + iam alt root: RGW99999999999999999 diff --git a/qa/suites/rgw/sts/overrides.yaml b/qa/suites/rgw/sts/overrides.yaml index 38a37048723d7..fe79f5d39406f 100644 --- a/qa/suites/rgw/sts/overrides.yaml +++ b/qa/suites/rgw/sts/overrides.yaml @@ -18,3 +18,6 @@ overrides: storage classes: LUKEWARM, FROZEN s3tests: storage classes: LUKEWARM, FROZEN + accounts: + iam root: RGW88888888888888888 + iam alt root: RGW99999999999999999 diff --git a/qa/suites/rgw/tempest/tasks/s3/s3tests.yaml b/qa/suites/rgw/tempest/tasks/s3/s3tests.yaml index 4efb579fa8344..06f3f9d46bb34 100644 --- a/qa/suites/rgw/tempest/tasks/s3/s3tests.yaml +++ b/qa/suites/rgw/tempest/tasks/s3/s3tests.yaml @@ -25,6 +25,10 @@ overrides: - name: member user: s3tests-main project: s3tests + s3tests: + accounts: + iam root: RGW88888888888888888 + iam alt root: RGW99999999999999999 tasks: - s3tests: diff --git a/qa/suites/rgw/thrash/workload/rgw_s3tests.yaml b/qa/suites/rgw/thrash/workload/rgw_s3tests.yaml index 0bcd000b6baae..298dab582a9c8 100644 --- a/qa/suites/rgw/thrash/workload/rgw_s3tests.yaml +++ b/qa/suites/rgw/thrash/workload/rgw_s3tests.yaml @@ -12,3 +12,7 @@ overrides: rgw crypt require ssl: false rgw sts key: abcdefghijklmnop rgw s3 auth use sts: true + s3tests: + accounts: + iam root: RGW88888888888888888 + iam alt root: RGW99999999999999999 diff --git a/qa/suites/rgw/website/overrides.yaml b/qa/suites/rgw/website/overrides.yaml index 5e7a1b591f096..ea458e38ac25b 100644 --- a/qa/suites/rgw/website/overrides.yaml +++ b/qa/suites/rgw/website/overrides.yaml @@ -24,3 +24,6 @@ overrides: valgrind: [--tool=memcheck, --max-threads=1024] # http://tracker.ceph.com/issues/25214 s3tests: calling-format: subdomain + accounts: + iam root: RGW88888888888888888 + iam alt root: RGW99999999999999999 -- 2.39.5