From: Zack Cerza <zack@redhat.com>
Date: Fri, 27 May 2022 17:47:40 +0000 (-0600)
Subject: suite: Allow 'git@' repo URLs
X-Git-Tag: 1.2.0~168^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0480d5d756770ee9a407c939025afa4c3763fb53;p=teuthology.git

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 6427548cf..a99e0d271 100644
--- 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 69f1f5037..67ac32410 100644
--- 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)