RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-25 11:48:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

s3tests: add force-branch with higher precdence than 'branch'

Browse Source 
This way we can force a branch despite something in overrides.

Signed-off-by: Sage Weil <sage@inktank.com>
This commit is contained in:
Sage Weil 2013-05-02 13:47:46 -07:00
parent 01d2e1593a
commit e3b0e1e820
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
teuthology/task/s3tests.py
View File

@ -20,7 +20,9 @@ def download(ctx, config):
log.info('Downloading s3-tests...')
testdir = teuthology.get_testdir(ctx)
for (client, cconf) in config.items():
branch = cconf.get('branch', 'master')
branch = cconf.get('force-branch', 'master')
if not branch:
branch = cconf.get('branch', 'master')
sha1 = cconf.get('sha1')
ctx.cluster.only(client).run(
args=[