s3tests: clone correct branch

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
(cherry picked from commit 9dac3fe8091f9b62699ec18b6157db17ac21c6bc)

Conflicts:

	teuthology/task/s3tests.py

diff --git a/teuthology/task/s3tests.py b/teuthology/task/s3tests.py
index af08bb5d641dadcde011eeb7d51fc8578b7c87e7..a50ca36ed7a8d9afa40c39945e10345cb9c0a322 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', None)
+        if not branch:
+            branch = cconf.get('branch', 'master')
         sha1 = cconf.get('sha1')
         ctx.cluster.only(client).run(
             args=[