Move the merger to a JSON-compatible API
In order to split out the merger as a new component, remove any
direct Zuul model object manipulation, instead passing in a
lists of dictionaries for merge instructions. Change the merger
algorithm so that it is compatible with this new method and makes
no assumptions about whether it has merged any changes previously.
There is likely to be a minor performance impact as some information
which was previously kept in-memory will now be fetched from the git
index.
The merger is also no-longer pre-populated with clones of git repos
at startup. Some tests were adjusted to accomodate this.
Change-Id: I3df86ae36b4969d568d1fb03df1e6569553d1226
diff --git a/tests/test_scheduler.py b/tests/test_scheduler.py
index dcfccce..3d3602e 100755
--- a/tests/test_scheduler.py
+++ b/tests/test_scheduler.py
@@ -66,9 +66,10 @@
def repack_repo(path):
- output = subprocess.Popen(
- ['git', '--git-dir=%s/.git' % path, 'repack', '-afd'],
- stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+ cmd = ['git', '--git-dir=%s/.git' % path, 'repack', '-afd']
+ output = subprocess.Popen(cmd, close_fds=True,
+ stdout=subprocess.PIPE,
+ stderr=subprocess.PIPE)
out = output.communicate()
if output.returncode:
raise Exception("git repack returned %d" % output.returncode)
@@ -158,6 +159,7 @@
repo.head.reference = 'master'
repo.head.reset(index=True, working_tree=True)
repo.git.clean('-x', '-f', '-d')
+ repo.heads['master'].checkout()
return r
def addPatchset(self, files=[], large=False):
@@ -944,11 +946,17 @@
repo_messages = [c.message.strip() for c in repo.iter_commits(ref)]
repo_shas = [c.hexsha for c in repo.iter_commits(ref)]
commit_messages = ['%s-1' % commit.subject for commit in commits]
+ self.log.debug("Checking if job %s has changes; commit_messages %s;"
+ " repo_messages %s; sha %s" % (job, commit_messages,
+ repo_messages, sha))
for msg in commit_messages:
if msg not in repo_messages:
+ self.log.debug(" messages do not match")
return False
if repo_shas[0] != sha:
+ self.log.debug(" sha does not match")
return False
+ self.log.debug(" OK")
return True
def registerJobs(self):
@@ -2343,6 +2351,10 @@
def test_merger_repack_large_change(self):
"Test that the merger works with large changes after a repack"
# https://bugs.launchpad.net/zuul/+bug/1078946
+ # This test assumes the repo is already cloned; make sure it is
+ url = self.sched.triggers['gerrit'].getGitUrl(
+ self.sched.layout.projects['org/project1'])
+ self.sched.merger.addProject('org/project1', url)
A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A')
A.addPatchset(large=True)
path = os.path.join(self.upstream_root, "org/project1")