have zuul perform merges

Bug #1021878 reported by James E. Blair
6
This bug affects 1 person
Affects Status Importance Assigned to Milestone
Zuul
New
Undecided
Unassigned

Bug Description

Instead of asking gerrit to merge changes, have zuul perform the merges.

That gives us more control over how the merge is performed, letting us, for instance, use standard git merge strategies (which are better than gerrit's), or cherry-pick changes while enforcing dependencies.

* Zuul would need to enforce commit dependencies.
* Zuul would need to enforce gerrit review policies.
* Zuul would need to add the git review notes.
* Zuul would need to run on something other than the jenkins server because it would have a key that can push to gerrit.

This would let us have more control over the commit history, and we can make it look nicer.
This would also let us handle cross-repo-dependencies in zuul.

Alternately, we can have zuul submit cherry-pick patches while enforcing the dependency order itself. Though that doesn't get us the CRD benefit.

Changed in openstack-ci:
assignee: nobody → David Ostrovsky (d-ostrovsky)
status: New → In Progress
James E. Blair (corvus)
Changed in openstack-ci:
assignee: David Ostrovsky (d-ostrovsky) → James E. Blair (corvus)
Changed in openstack-ci:
milestone: none → folsom
Monty Taylor (mordred)
Changed in openstack-ci:
importance: Undecided → Medium
James E. Blair (corvus)
Changed in openstack-ci:
milestone: folsom → grizzly
James E. Blair (corvus)
Changed in openstack-ci:
milestone: grizzly → havana
Revision history for this message
James E. Blair (corvus) wrote :

Here is a case not currently handled by Zuul's merger that will need to be dealt with: a change in gerrit with a parent commit that is not a change in gerrit. Example:

https://review.openstack.org/#/c/39890/ (patchset 27).

This case needs to be detected and rejected by zuul as early as possible.

Jeremy Stanley (fungi)
Changed in openstack-ci:
milestone: havana → icehouse
James E. Blair (corvus)
no longer affects: openstack-ci
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.