From: Radoslaw Zarzynski <rzarzyns@redhat.com>
Date: Fri, 7 Jul 2017 16:44:50 +0000 (-0400)
Subject: qa/tasks/swift: add support for the "force-branch" configurable.
X-Git-Tag: v13.1.0~498^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F21027%2Fhead;p=ceph.git

qa/tasks/swift: add support for the "force-branch" configurable.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
---

diff --git a/qa/tasks/swift.py b/qa/tasks/swift.py
index 59804b151844..1966ced3407b 100644
--- a/qa/tasks/swift.py
+++ b/qa/tasks/swift.py
@@ -23,12 +23,13 @@ def download(ctx, config):
     Download the Swift API.
     """
     testdir = teuthology.get_testdir(ctx)
-    assert isinstance(config, list)
+    assert isinstance(config, dict)
     log.info('Downloading swift...')
-    for client in config:
+    for (client, cconf) in config.items():
         ctx.cluster.only(client).run(
             args=[
                 'git', 'clone',
+                '-b', cconf.get('force-branch', 'ceph-master'),
                 teuth_config.ceph_git_base_url + 'swift.git',
                 '{tdir}/swift'.format(tdir=testdir),
                 ],
@@ -38,7 +39,7 @@ def download(ctx, config):
     finally:
         log.info('Removing swift...')
         testdir = teuthology.get_testdir(ctx)
-        for client in config:
+        for (client, _) in config.items():
             ctx.cluster.only(client).run(
                 args=[
                     'rm',
@@ -252,7 +253,7 @@ def task(ctx, config):
                 )
 
     with contextutil.nested(
-        lambda: download(ctx=ctx, config=clients),
+        lambda: download(ctx=ctx, config=config),
         lambda: create_users(ctx=ctx, config=dict(
                 clients=clients,
                 testswift_conf=testswift_conf,