RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-15 07:56:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Smarter s3tests branch selection

Browse Source 
Signed-off-by: Zack Cerza <zack.cerza@inktank.com>
This commit is contained in:
Zack Cerza 2014-10-22 09:12:43 -06:00
parent 0d1f88593d
commit 1b8d31986a
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tasks/s3tests.py
View File

@ -23,7 +23,7 @@ log = logging.getLogger(__name__)
def extract_sync_client_data(ctx, client_name):
"""
Extract synchronized client rgw zone and rgw region information.
:param ctx: Context passed to the s3tests task
:param name: Name of client that we are synching with
"""
@ -117,7 +117,7 @@ def download(ctx, config):
"""
Download the s3 tests from the git builder.
Remove downloaded s3 file upon exit.
The context passed in should be identical to the context
passed in to the main task.
"""
@ -127,7 +127,14 @@ def download(ctx, config):
for (client, cconf) in config.items():
branch = cconf.get('force-branch', None)
if not branch:
branch = cconf.get('branch', 'master')
ceph_branch = ctx.config.get('branch')
suite_branch = ctx.config.get('suite_branch', ceph_branch)
branch = cconf.get('branch', suite_branch)
if not branch:
raise ValueError(
"Could not determine what branch to use for s3tests!")
else:
log.info("Using branch '%s' for s3tests", branch)
sha1 = cconf.get('sha1')
ctx.cluster.only(client).run(
args=[