opendev/pypi-mirror
Code Issues Proposed changes

Make gerrit port configurable.

Browse Source 
Change-Id: Idf87910a9f82556f247e0232468f2f883d718f97
Reviewed-on: https://review.openstack.org/33927
Reviewed-by: Jeremy Stanley <fungi@yuggoth.org>
Approved: Clark Boylan <clark.boylan@gmail.com>
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Tested-by: Jenkins
This commit is contained in:
Monty Taylor 2013-06-21 02:32:08 -04:00 committed by Jenkins
parent 2f13d563c2
commit 805a30109c
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
jeepyb/cmd/manage_projects.py
View File

@ -296,6 +296,7 @@ def main():
LOCAL_GIT_DIR = defaults.get('local-git-dir', '/var/lib/git') LOCAL_GIT_DIR = defaults.get('local-git-dir', '/var/lib/git')
ACL_DIR = defaults.get('acl-dir') ACL_DIR = defaults.get('acl-dir')
GERRIT_HOST = defaults.get('gerrit-host') GERRIT_HOST = defaults.get('gerrit-host')
GERRIT_PORT = defaults.get('gerrit-port', '29418')
GERRIT_USER = defaults.get('gerrit-user') GERRIT_USER = defaults.get('gerrit-user')
GERRIT_KEY = defaults.get('gerrit-key') GERRIT_KEY = defaults.get('gerrit-key')
GERRIT_GITID = defaults.get('gerrit-committer') GERRIT_GITID = defaults.get('gerrit-committer')
@ -304,7 +305,7 @@ def main():
gerrit = gerritlib.gerrit.Gerrit('localhost', gerrit = gerritlib.gerrit.Gerrit('localhost',
GERRIT_USER, GERRIT_USER,
29418, GERRIT_PORT,
GERRIT_KEY) GERRIT_KEY)
project_list = gerrit.listProjects() project_list = gerrit.listProjects()
ssh_env = make_ssh_wrapper(GERRIT_USER, GERRIT_KEY) ssh_env = make_ssh_wrapper(GERRIT_USER, GERRIT_KEY)
@ -324,7 +325,7 @@ def main():
create_github_project(defaults, options, project, create_github_project(defaults, options, project,
description, homepage) description, homepage)
remote_url = "ssh://localhost:29418/%s" % project remote_url = "ssh://localhost:%s/%s" % (GERRIT_PORT, project)
if project not in project_list: if project not in project_list:
tmpdir = tempfile.mkdtemp() tmpdir = tempfile.mkdtemp()
try: try:
@ -345,9 +346,9 @@ def main():
'w') as gitreview: 'w') as gitreview:
gitreview.write("""[gerrit] gitreview.write("""[gerrit]
host=%s host=%s
port=29418 port=%s
project=%s project=%s
""" % (GERRIT_HOST, project_git)) """ % (GERRIT_HOST, GERRIT_PORT, project_git))
git_command(repo_path, "add .gitreview") git_command(repo_path, "add .gitreview")
cmd = ("commit -a -m'Added .gitreview' --author='%s'" cmd = ("commit -a -m'Added .gitreview' --author='%s'"
% GERRIT_GITID) % GERRIT_GITID)