Make gerrit-git-fetch params configurable

Change-Id: I793153a63a82a98e90b0ecc2404e8d6596f2be48
This commit is contained in:
Joshua Hesketh 2014-01-31 13:53:35 +11:00
parent ae4ef1eaa4
commit 15e1e6977e
2 changed files with 5 additions and 4 deletions

View File

@ -1,6 +1,8 @@
{ {
"zuul_server": { "zuul_server": {
"git_url": "http://119.9.13.90/p/", "gerrit_site": "http://review.openstack.org",
"zuul_site": "http://119.9.13.90",
"git_origin": "git://git.openstack.org/",
"gearman_host": "119.9.13.90", "gearman_host": "119.9.13.90",
"gearman_port": 4730 "gearman_port": 4730
}, },

View File

@ -182,12 +182,11 @@ class ShellTask(Task):
os.makedirs(local_path) os.makedirs(local_path)
git_args = copy.deepcopy(job_args) git_args = copy.deepcopy(job_args)
git_args['GIT_ORIGIN'] = 'git://git.openstack.org/'
cmd = os.path.join(os.path.join(os.path.dirname(__file__), cmd = os.path.join(os.path.join(os.path.dirname(__file__),
'gerrit-git-prep.sh')) 'gerrit-git-prep.sh'))
cmd += ' https://review.openstack.org' cmd += ' ' + self.global_config['zuul_server']['gerrit_site']
cmd += ' http://zuul.rcbops.com' cmd += ' ' + self.global_config['zuul_server']['zuul_site']
utils.execute_to_log(cmd, self.shell_output_log, env=git_args, utils.execute_to_log(cmd, self.shell_output_log, env=git_args,
cwd=local_path) cwd=local_path)
self.git_path = local_path self.git_path = local_path