diff options
| author | Radoslaw Zarzynski <rzarzyns@redhat.com> | 2017-07-07 18:44:50 +0200 |
|---|---|---|
| committer | Casey Bodley <cbodley@redhat.com> | 2018-03-23 17:40:05 +0100 |
| commit | c5859f25e6f9e6687892ff7231051295d4f285af (patch) | |
| tree | bcc182666c76446a01b4952a6009e462d6c58357 /qa/tasks/swift.py | |
| parent | Merge pull request #21008 from trociny/wip-23430 (diff) | |
| download | ceph-c5859f25e6f9e6687892ff7231051295d4f285af.tar.xz ceph-c5859f25e6f9e6687892ff7231051295d4f285af.zip | |
qa/tasks/swift: add support for the "force-branch" configurable.
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Diffstat (limited to 'qa/tasks/swift.py')
| -rw-r--r-- | qa/tasks/swift.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/qa/tasks/swift.py b/qa/tasks/swift.py index 59804b15184..1966ced3407 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, |