From 159c455a0326eef2c017b3e3cf510f918b5ec76c Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 14 Dec 2016 12:18:29 -0500 Subject: [PATCH] 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 --- tasks/workunit.py | 48 +++++++++++++++-------------------------------- 1 file changed, 15 insertions(+), 33 deletions(-) diff --git a/tasks/workunit.py b/tasks/workunit.py index 41802e712de..d424b324110 100644 --- a/tasks/workunit.py +++ b/tasks/workunit.py @@ -309,39 +309,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), -- 2.39.5