diff options
| author | Zuul <zuul@review.opendev.org> | 2022-02-24 21:10:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-02-24 21:10:31 +0000 |
| commit | 3ddb9713a49933f92bef59c63509e9fccf990dd3 (patch) | |
| tree | 3cebd1983493303756eae1d433f5529eb148392f | |
| parent | d6318a48ff082e03173751d399aa418bbcf82902 (diff) | |
| parent | 32bdb7300e229172282c98a4b46f1a51b2cb2712 (diff) | |
| download | zuul-3ddb9713a49933f92bef59c63509e9fccf990dd3.tar.gz | |
Merge "Clone from /a/ with authenticated Gerrit HTTP"
| -rw-r--r-- | tests/unit/test_gerrit.py | 2 | ||||
| -rw-r--r-- | zuul/driver/gerrit/gerritconnection.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/unit/test_gerrit.py b/tests/unit/test_gerrit.py index f57a6c608..23a6a0cb5 100644 --- a/tests/unit/test_gerrit.py +++ b/tests/unit/test_gerrit.py @@ -127,7 +127,7 @@ class TestGerrit(BaseTestCase): project = gerrit.source.getProject('org/project') url = gerrit.source.getGitUrl(project) self.assertEqual( - 'https://gerrit:1%2Fbadpassword@localhost/org/project', + 'https://gerrit:1%2Fbadpassword@localhost/a/org/project', url) def test_git_over_ssh_getGitURL(self): diff --git a/zuul/driver/gerrit/gerritconnection.py b/zuul/driver/gerrit/gerritconnection.py index 53ea7104c..704ca2d2b 100644 --- a/zuul/driver/gerrit/gerritconnection.py +++ b/zuul/driver/gerrit/gerritconnection.py @@ -1564,7 +1564,7 @@ class GerritConnection(ZKChangeCacheMixin, ZKBranchCacheMixin, BaseConnection): urllib.parse.quote(self.password, safe=''), baseurl[1]) baseurl = urllib.parse.urlunparse(baseurl) - url = ('%s/%s' % (baseurl, project.name)) + url = ('%s/a/%s' % (baseurl, project.name)) else: url = 'ssh://%s@%s:%s/%s' % (self.user, self.server, self.port, project.name) |