diff options
| author | Joshua Hesketh <josh@nitrotech.org> | 2014-01-31 13:53:35 +1100 |
|---|---|---|
| committer | Joshua Hesketh <josh@nitrotech.org> | 2014-01-31 13:59:25 +1100 |
| commit | 15e1e6977e69d0dbc8155312b1f1a633e9427a0d (patch) | |
| tree | c2d752501e3c510942a04d3c604ea749fc57a0cc | |
| parent | ae4ef1eaa4249b38e9f1ca22426ac64433e55ce6 (diff) | |
| download | turbo-hipster-15e1e6977e69d0dbc8155312b1f1a633e9427a0d.tar.gz | |
Make gerrit-git-fetch params configurable
Change-Id: I793153a63a82a98e90b0ecc2404e8d6596f2be48
| -rw-r--r-- | etc/turbo-hipster/config.json | 4 | ||||
| -rw-r--r-- | turbo_hipster/lib/models.py | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/etc/turbo-hipster/config.json b/etc/turbo-hipster/config.json index ef02532..aa33e06 100644 --- a/etc/turbo-hipster/config.json +++ b/etc/turbo-hipster/config.json @@ -1,6 +1,8 @@ { "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_port": 4730 }, diff --git a/turbo_hipster/lib/models.py b/turbo_hipster/lib/models.py index e21c96c..d445379 100644 --- a/turbo_hipster/lib/models.py +++ b/turbo_hipster/lib/models.py @@ -182,12 +182,11 @@ class ShellTask(Task): os.makedirs(local_path) 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__), 'gerrit-git-prep.sh')) - cmd += ' https://review.openstack.org' - cmd += ' http://zuul.rcbops.com' + cmd += ' ' + self.global_config['zuul_server']['gerrit_site'] + cmd += ' ' + self.global_config['zuul_server']['zuul_site'] utils.execute_to_log(cmd, self.shell_output_log, env=git_args, cwd=local_path) self.git_path = local_path |