suite: Allow 'git@' repo URLs

We were accidentally mangling them.

Signed-off-by: Zack Cerza <zack@redhat.com>

diff --git a/teuthology/suite/run.py b/teuthology/suite/run.py
index 6427548cf5a89033806f575837955c3e22e8222a..a99e0d271087a4a0490e7ced2074bcf079992c0c 100644 (file)
--- a/teuthology/suite/run.py
+++ b/teuthology/suite/run.py
@@ -174,7 +174,8 @@ class Run(object):
             log.info("ceph sha1 explicitly supplied")
 
         elif self.args.ceph_branch:
-            ceph_hash = util.git_ls_remote(repo_name, self.args.ceph_branch)
+            ceph_hash = util.git_ls_remote(
+                self.args.ceph_repo, self.args.ceph_branch)
             if not ceph_hash:
                 exc = BranchNotFoundError(
                     self.args.ceph_branch,

diff --git a/teuthology/suite/util.py b/teuthology/suite/util.py
index 69f1f5037690b83095646d11843d3a7ca561cd0a..67ac32410945016174f6e6c364aaedb429458c4e 100644 (file)
--- a/teuthology/suite/util.py
+++ b/teuthology/suite/util.py
@@ -187,7 +187,7 @@ def git_ls_remote(project_or_url, branch, project_owner='ceph'):
                            name is passed; not when a URL is passed
     :returns: The sha1 if found; else None
     """
-    if '://' in project_or_url:
+    if '://' in project_or_url or project_or_url.startswith('git@'):
         url = project_or_url
     else:
         url = build_git_url(project_or_url, project_owner)