From e3b0e1e820d0caaf2077bf498dac1cc27ca856fb Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 2 May 2013 13:47:46 -0700 Subject: [PATCH] s3tests: add force-branch with higher precdence than 'branch' This way we can force a branch despite something in overrides. Signed-off-by: Sage Weil --- teuthology/task/s3tests.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/teuthology/task/s3tests.py b/teuthology/task/s3tests.py index af08bb5d641da..f2c4f281e6ac7 100644 --- a/teuthology/task/s3tests.py +++ b/teuthology/task/s3tests.py @@ -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=[ -- 2.39.5