]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
tests: swift.py: clone the ceph-jewel branch 16131/head
authorNathan Cutler <ncutler@suse.com>
Sun, 25 Jun 2017 07:27:47 +0000 (09:27 +0200)
committerNathan Cutler <ncutler@suse.com>
Fri, 21 Jul 2017 13:32:28 +0000 (15:32 +0200)
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

qa/tasks/swift.py

index 28f75dd0afde99135ffb621f3c88e5e56331a4be..76bbcef1c1ce965f915ff651f239c4359e838ea6 100644 (file)
@@ -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),
                 ],