commit 38a1de5ec9559dcfd9fd283402ee43baa2bfa510
author Jenkins <jenkins@review.openstack.org> Thu Dec 01 11:10:52 2016 +0000
committer Gerrit Code Review <review@openstack.org> Thu Dec 01 11:10:52 2016 +0000
tree 3746c52a1f56fe67d480d5b375ce5e02e5c09a2c
parent b4947125f89a42745324e490f3fcd2ed15884dc3
parent 0c9e4f3e995cd759236e7647bb8f710add1b68ae

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

zuul/launcher/server.py

diff --git a/zuul/launcher/server.py b/zuul/launcher/server.py
index 2705f27..489869f 100644
--- a/zuul/launcher/server.py
+++ b/zuul/launcher/server.py
@@ -351,7 +351,11 @@
                 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)