From: Sage Weil <sage@redhat.com>
Date: Wed, 14 Dec 2016 17:18:29 +0000 (-0500)
Subject: tasks/workunit: remove kludge to use git.ceph.com
X-Git-Tag: v0.94.10~27^2^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6bdc3bb6a00480b721b9795bd5e132b1dbf04ac0;p=ceph.git

tasks/workunit: remove kludge to use git.ceph.com

This was hard-coded to ceph.git (almost) and breaks when
you specify --ceph-repo.  Remove it entirely.  We'll see if
github.com is better at handling our load than it used to
be!

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 159c455a0326eef2c017b3e3cf510f918b5ec76c)
---

diff --git a/tasks/workunit.py b/tasks/workunit.py
index 12e5b98db1e..833d81df217 100644
--- a/tasks/workunit.py
+++ b/tasks/workunit.py
@@ -291,39 +291,21 @@ def _run_tests(ctx, refspec, role, tests, env, subdir=None, timeout=None):
     clonedir = '{tdir}/clone.{role}'.format(tdir=testdir, role=role)
 
     git_url = teuth_config.get_ceph_git_url()
-    if 'github.com/ceph/ceph' in git_url:
-        remote.run(
-            logger=log.getChild(role),
-            args=[
-                'mkdir', '--', srcdir,
-                run.Raw('&&'),
-                'git',
-                'archive',
-                '--remote=git://git.ceph.com/ceph.git',
-                '%s:qa/workunits' % refspec,
-                run.Raw('|'),
-                'tar',
-                '-C', srcdir,
-                '-x',
-                '-f-',
-            ],
-        )
-    else:
-        remote.run(
-            logger=log.getChild(role),
-            args=[
-                'git',
-                'clone',
-                git_url,
-                clonedir,
-                run.Raw(';'),
-                'cd', '--', clonedir,
-                run.Raw('&&'),
-                'git', 'checkout', refspec,
-                run.Raw('&&'),
-                'mv', 'qa/workunits', srcdir,
-            ],
-        )
+    remote.run(
+        logger=log.getChild(role),
+        args=[
+            'git',
+            'clone',
+            git_url,
+            clonedir,
+            run.Raw(';'),
+            'cd', '--', clonedir,
+            run.Raw('&&'),
+            'git', 'checkout', refspec,
+            run.Raw('&&'),
+            'mv', 'qa/workunits', srcdir,
+        ],
+    )
 
     remote.run(
         logger=log.getChild(role),