gian/ceph-mirror
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2026-08-02 07:03:18 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

qa/rgw: Run s3-tests from within the Ceph repo

Browse Source 
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
This commit is contained in:
Adam C. Emerson 2025-09-29 17:11:09 -04:00
parent 868d20182a
commit d0c88cb53c
No known key found for this signature in database
17 changed files with 12 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qa/rgw/s3tests-branch.yaml
View File

@ -1,4 +0,0 @@
overrides:
s3tests:
force-branch: ceph-master
# git_remote: https://github.com/ceph/

1
qa/suites/crimson-rados/rgw/lifecycle/s3tests-branch.yaml
View File

@ -1 +0,0 @@
.qa/rgw/s3tests-branch.yaml

1
qa/suites/crimson-rados/rgw/multifs/s3tests-branch.yaml
View File

@ -1 +0,0 @@
.qa/rgw/s3tests-branch.yaml

1
qa/suites/crimson-rados/rgw/sts/s3tests-branch.yaml
View File

@ -1 +0,0 @@
.qa/rgw/s3tests-branch.yaml

1
qa/suites/rgw/bucket-logging/s3tests-branch.yaml
View File

@ -1 +0,0 @@
.qa/rgw/s3tests-branch.yaml

1
qa/suites/rgw/cloud-transition/s3tests-branch.yaml
View File

@ -1 +0,0 @@
.qa/rgw/s3tests-branch.yaml

1
qa/suites/rgw/crypt/s3tests-branch.yaml
View File

@ -1 +0,0 @@
.qa/rgw/s3tests-branch.yaml

1
qa/suites/rgw/dbstore/s3tests-branch.yaml
View File

@ -1 +0,0 @@
.qa/rgw/s3tests-branch.yaml

1
qa/suites/rgw/lifecycle/s3tests-branch.yaml
View File

@ -1 +0,0 @@
.qa/rgw/s3tests-branch.yaml

1
qa/suites/rgw/multifs/s3tests-branch.yaml
View File

@ -1 +0,0 @@
.qa/rgw/s3tests-branch.yaml

1
qa/suites/rgw/s3control/s3tests-branch.yaml
View File

@ -1 +0,0 @@
.qa/rgw/s3tests-branch.yaml

1
qa/suites/rgw/sts/s3tests-branch.yaml
View File

@ -1 +0,0 @@
.qa/rgw/s3tests-branch.yaml

1
qa/suites/rgw/tempest/s3tests-branch.yaml
View File

@ -1 +0,0 @@
.qa/rgw/s3tests-branch.yaml

1
qa/suites/rgw/thrash/s3tests-branch.yaml
View File

@ -1 +0,0 @@
.qa/rgw/s3tests-branch.yaml

1
qa/suites/rgw/verify/s3tests-branch.yaml
View File

@ -1 +0,0 @@
.qa/rgw/s3tests-branch.yaml

1
qa/suites/rgw/website/s3tests-branch.yaml
View File

@ -1 +0,0 @@
.qa/rgw/s3tests-branch.yaml

26
qa/tasks/s3tests.py
View File

@ -32,31 +32,29 @@ def download(ctx, config):
assert isinstance(config, dict)
log.info('Downloading s3-tests...')
testdir = teuthology.get_testdir(ctx)
s3tests_branch = ctx.config.get('suite_branch') or ctx.config.get('branch')
s3tests_repo = ctx.config.get('suite_repo') or teuth_config.get_ceph_qa_suite_git_url()
s3tests_sha1 = ctx.config.get('suite_sha1')
if not s3tests_branch:
raise ValueError(
"Could not determine what branch to use for ceph suite.")
for (client, client_config) in config.items():
s3tests_branch = client_config.get('force-branch', None)
if not s3tests_branch:
raise ValueError(
"Could not determine what branch to use for s3-tests. Please add 'force-branch: {s3-tests branch name}' to the .yaml config for this s3tests task.")
log.info("Using branch '%s' for s3tests", s3tests_branch)
sha1 = client_config.get('sha1')
git_remote = client_config.get('git_remote', teuth_config.ceph_git_base_url)
ctx.cluster.only(client).run(
args=[
'git', 'clone',
'-b', s3tests_branch,
git_remote + 's3-tests.git',
'{tdir}/s3-tests-{client}'.format(tdir=testdir, client=client),
'git', 'clone', '-b', s3tests_branch,
s3tests_repo, '{tdir}/s3-tests-{client}'.format(tdir=testdir, client=client),
],
)
if sha1 is not None:
if s3tests_sha1 is not None:
ctx.cluster.only(client).run(
args=[
'cd', '{tdir}/s3-tests-{client}'.format(tdir=testdir, client=client),
run.Raw('&&'),
'git', 'reset', '--hard', sha1,
'git', 'reset', '--hard', s3tests_sha1,
],
)
if client_config.get('boto3_extensions'):
ctx.cluster.only(client).run(
args=['mkdir',
@ -464,7 +462,7 @@ def run_tests(ctx, config):
client_config = client_config or {}
(remote,) = ctx.cluster.only(client).remotes.keys()
args = [
'cd', '{tdir}/s3-tests-{client}'.format(tdir=testdir, client=client), run.Raw('&&'),
'cd', '{tdir}/s3-tests-{client}/src/test/rgw/s3-tests'.format(tdir=testdir, client=client), run.Raw('&&'),
'S3TEST_CONF={tdir}/archive/s3-tests.{client}.conf'.format(tdir=testdir, client=client),
'BOTO_CONFIG={tdir}/boto-{client}.cfg'.format(tdir=testdir, client=client)
]