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 <sage@inktank.com>

diff --git a/teuthology/task/s3tests.py b/teuthology/task/s3tests.py
index af08bb5d641dadcde011eeb7d51fc8578b7c87e7..f2c4f281e6ac78d33fb5e3be85533c97ac68b355 100644 (file)
--- 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=[