zuul
/
zuul
Code Issues Proposed changes

Merge "Don't merge post-merge items" into feature/zuulv3

This commit is contained in:
Jenkins 2016-12-01 11:10:52 +00:00 committed by Gerrit Code Review
parent b4947125f8 0c9e4f3e99
commit 38a1de5ec9
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
zuul/launcher/server.py
View File

@ -351,7 +351,11 @@ class LaunchServer(object):
task.wait()
self.log.debug("Job %s: git updates complete" % (job.unique,))
merger = self._getMerger(jobdir.git_root)
commit = merger.mergeChanges(args['items']) # noqa
merge_items = [i for i in args['items'] if i.get('refspec')]
if merge_items:
commit = merger.mergeChanges(merge_items) # noqa
else:
commit = args['items'][-1]['newrev'] # noqa
# TODOv3: Ansible the ansible thing here.
self.prepareAnsibleFiles(jobdir, args)