From: Nathan Cutler <ncutler@suse.com>
Date: Sun, 25 Jun 2017 07:27:47 +0000 (+0200)
Subject: tests: swift.py: clone the ceph-jewel branch
X-Git-Tag: v11.2.1~19^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b8dfa2f73aff0998a4aebf6f61865983f476b8d1;p=ceph.git

tests: swift.py: clone the ceph-jewel branch

The master branch of ceph/swift.git contains tests that are incompatible with
Jewel and Hammer. The ceph-jewel branch omits these tests.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit a86ce728954a765797ce634025d43650d990e480)

Conflicts:
    qa/tasks/swift.py: clone ceph-kraken branch instead of ceph-jewel
---

diff --git a/qa/tasks/swift.py b/qa/tasks/swift.py
index 28f75dd0afd..76bbcef1c1c 100644
--- a/qa/tasks/swift.py
+++ b/qa/tasks/swift.py
@@ -28,7 +28,10 @@ def download(ctx, config):
     for client in config:
         ctx.cluster.only(client).run(
             args=[
-                'git', 'clone',
+                'git',
+                'clone',
+                '--branch',
+                'ceph-kraken',
                 teuth_config.ceph_git_base_url + 'swift.git',
                 '{tdir}/swift'.format(tdir=testdir),
                 ],