gate-merge jobs should perform the same merge as gerrit

Bug #981040 reported by James E. Blair
6
This bug affects 1 person
Affects Status Importance Assigned to Milestone
OpenStack Core Infrastructure
Fix Released
Medium
James E. Blair

Bug Description

It would be good if gate-*-merge jobs detected merge types that gerrit will reject so we can error out earlier. See this change for an example: https://review.openstack.org/#/c/6360/

Monty Taylor (mordred)
Changed in openstack-ci:
status: New → Triaged
importance: Undecided → Medium
milestone: none → folsom
Revision history for this message
James E. Blair (corvus) wrote :

Or this kind of path conflict:

https://review.openstack.org/#/c/7991/1

Monty Taylor (mordred)
summary: - gate-merge jobs should detect criss-cross merges and error out
+ gate-merge jobs should perform the same merge as gerrit
Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Fix proposed to openstack-ci-puppet (master)

Fix proposed to branch: master
Review: https://review.openstack.org/8724

Changed in openstack-ci:
assignee: nobody → James E. Blair (corvus)
status: Triaged → In Progress
Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Fix merged to openstack-ci-puppet (master)

Reviewed: https://review.openstack.org/8724
Committed: http://github.com/openstack/openstack-ci-puppet/commit/266aa44260065532545b6b862440ec17727554d4
Submitter: Jenkins
Branch: master

commit 266aa44260065532545b6b862440ec17727554d4
Author: James E. Blair <email address hidden>
Date: Tue Jun 19 15:27:02 2012 -0700

    Make the merge in gerrit-git-prep like gerrit.

    Fixes bug 981040.

    Change-Id: I89960b76f1ae6e5be6b2f5fc4695f00a7c90452a

Changed in openstack-ci:
status: In Progress → Fix Released
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.