Merge "Split merger and launcher git roots" into feature/zuulv3
This commit is contained in:
commit
1f8ee7f550
|
@ -1195,7 +1195,8 @@ class ZuulTestCase(BaseTestCase):
|
|||
tmp_root = os.environ.get("ZUUL_TEST_ROOT")
|
||||
self.test_root = os.path.join(tmp_root, "zuul-test")
|
||||
self.upstream_root = os.path.join(self.test_root, "upstream")
|
||||
self.git_root = os.path.join(self.test_root, "git")
|
||||
self.merger_git_root = os.path.join(self.test_root, "merger-git")
|
||||
self.launcher_git_root = os.path.join(self.test_root, "launcher-git")
|
||||
self.state_root = os.path.join(self.test_root, "lib")
|
||||
|
||||
if os.path.exists(self.test_root):
|
||||
|
@ -1209,7 +1210,8 @@ class ZuulTestCase(BaseTestCase):
|
|||
self.config.set('zuul', 'tenant_config',
|
||||
os.path.join(FIXTURE_DIR,
|
||||
self.config.get('zuul', 'tenant_config')))
|
||||
self.config.set('merger', 'git_dir', self.git_root)
|
||||
self.config.set('merger', 'git_dir', self.merger_git_root)
|
||||
self.config.set('launcher', 'git_dir', self.launcher_git_root)
|
||||
self.config.set('zuul', 'state_dir', self.state_root)
|
||||
|
||||
# For each project in config:
|
||||
|
|
|
@ -7,11 +7,14 @@ url_pattern=http://logs.example.com/{change.number}/{change.patchset}/{pipeline.
|
|||
job_name_in_report=true
|
||||
|
||||
[merger]
|
||||
git_dir=/tmp/zuul-test/git
|
||||
git_dir=/tmp/zuul-test/merger-git
|
||||
git_user_email=zuul@example.com
|
||||
git_user_name=zuul
|
||||
zuul_url=http://zuul.example.com/p
|
||||
|
||||
[launcher]
|
||||
git_dir=/tmp/zuul-test/launcher-git
|
||||
|
||||
[swift]
|
||||
authurl=https://identity.api.example.org/v2.0/
|
||||
user=username
|
||||
|
|
|
@ -7,11 +7,14 @@ url_pattern=http://logs.example.com/{change.number}/{change.patchset}/{pipeline.
|
|||
job_name_in_report=true
|
||||
|
||||
[merger]
|
||||
git_dir=/tmp/zuul-test/git
|
||||
git_dir=/tmp/zuul-test/merger-git
|
||||
git_user_email=zuul@example.com
|
||||
git_user_name=zuul
|
||||
zuul_url=http://zuul.example.com/p
|
||||
|
||||
[launcher]
|
||||
git_dir=/tmp/zuul-test/launcher-git
|
||||
|
||||
[swift]
|
||||
authurl=https://identity.api.example.org/v2.0/
|
||||
user=username
|
||||
|
|
|
@ -7,11 +7,14 @@ url_pattern=http://logs.example.com/{change.number}/{change.patchset}/{pipeline.
|
|||
job_name_in_report=true
|
||||
|
||||
[merger]
|
||||
git_dir=/tmp/zuul-test/git
|
||||
git_dir=/tmp/zuul-test/merger-git
|
||||
git_user_email=zuul@example.com
|
||||
git_user_name=zuul
|
||||
zuul_url=http://zuul.example.com/p
|
||||
|
||||
[launcher]
|
||||
git_dir=/tmp/zuul-test/launcher-git
|
||||
|
||||
[swift]
|
||||
authurl=https://identity.api.example.org/v2.0/
|
||||
user=username
|
||||
|
|
|
@ -1377,8 +1377,12 @@ class TestScheduler(ZuulTestCase):
|
|||
self.assertEmptyQueues()
|
||||
self.build_history = []
|
||||
|
||||
path = os.path.join(self.git_root, "org/project")
|
||||
print(repack_repo(path))
|
||||
path = os.path.join(self.merger_git_root, "org/project")
|
||||
if os.path.exists(path):
|
||||
repack_repo(path)
|
||||
path = os.path.join(self.launcher_git_root, "org/project")
|
||||
if os.path.exists(path):
|
||||
repack_repo(path)
|
||||
|
||||
A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
|
||||
A.addApproval('code-review', 2)
|
||||
|
@ -1404,9 +1408,13 @@ class TestScheduler(ZuulTestCase):
|
|||
A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A')
|
||||
A.addPatchset(large=True)
|
||||
path = os.path.join(self.upstream_root, "org/project1")
|
||||
print(repack_repo(path))
|
||||
path = os.path.join(self.git_root, "org/project1")
|
||||
print(repack_repo(path))
|
||||
repack_repo(path)
|
||||
path = os.path.join(self.merger_git_root, "org/project1")
|
||||
if os.path.exists(path):
|
||||
repack_repo(path)
|
||||
path = os.path.join(self.launcher_git_root, "org/project1")
|
||||
if os.path.exists(path):
|
||||
repack_repo(path)
|
||||
|
||||
A.addApproval('code-review', 2)
|
||||
self.fake_gerrit.addEvent(A.addApproval('approved', 1))
|
||||
|
@ -2668,7 +2676,11 @@ class TestScheduler(ZuulTestCase):
|
|||
self.assertEqual(A.reported, 2)
|
||||
|
||||
# Delete org/new-project zuul repo. Should be recloned.
|
||||
shutil.rmtree(os.path.join(self.git_root, "org/delete-project"))
|
||||
p = 'org/delete-project'
|
||||
if os.path.exists(os.path.join(self.merger_git_root, p)):
|
||||
shutil.rmtree(os.path.join(self.merger_git_root, p))
|
||||
if os.path.exists(os.path.join(self.launcher_git_root, p)):
|
||||
shutil.rmtree(os.path.join(self.launcher_git_root, p))
|
||||
|
||||
B = self.fake_gerrit.addFakeChange('org/delete-project', 'master', 'B')
|
||||
|
||||
|
|
|
@ -208,10 +208,10 @@ class LaunchServer(object):
|
|||
unverbose=self.verboseOff,
|
||||
)
|
||||
|
||||
if self.config.has_option('merger', 'git_dir'):
|
||||
self.merge_root = self.config.get('merger', 'git_dir')
|
||||
if self.config.has_option('launcher', 'git_dir'):
|
||||
self.merge_root = self.config.get('launcher', 'git_dir')
|
||||
else:
|
||||
self.merge_root = '/var/lib/zuul/git'
|
||||
self.merge_root = '/var/lib/zuul/launcher-git'
|
||||
|
||||
if self.config.has_option('merger', 'git_user_email'):
|
||||
self.merge_email = self.config.get('merger', 'git_user_email')
|
||||
|
|
|
@ -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')
|
||||
|
|
Loading…
Reference in New Issue