zuul/zuul
Code Issues Proposed changes

Split merger and launcher git roots

Browse Source 
In case a user runs a merger and a launcher on the same host, make
sure that they don't share a git directory (used by the launcher's
internal merger).  They could end up colliding.

Incidentally, that's basically the configuraton used in tests, so
update the test configuration likewise.

Change-Id: I64a690c706d00583973bd2d542a5f42ae6e9ef36
This commit is contained in:
James E. Blair
2017-02-07 14:04:12 -08:00
committed by Clint Byrum
parent 17e4fa9748
commit 8c1be53819
7 changed files with 38 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
zuul/merger/server.py
View File

@@ -32,7 +32,7 @@ class MergeServer(object):
if self.config.has_option('merger', 'git_dir'):
merge_root = self.config.get('merger', 'git_dir')
else:
merge_root = '/var/lib/zuul/git'
merge_root = '/var/lib/zuul/merger-git'
if self.config.has_option('merger', 'git_user_email'):
merge_email = self.config.get('merger', 'git_user_email')