New issue
Advanced search Search tips
Note: Color blocks (like or ) mean that a user may not be available. Tooltip shows the reason.

Issue 622148 link

Starred by 3 users

Issue metadata

Status: WontFix
Owner: ----
Closed: Aug 2016
Cc:
Components:
EstimatedDays: ----
NextAction: ----
OS: ----
Pri: 3
Type: Feature



Sign in to add a comment

Gerrit CQ should abort the run if there is merge conflict.

Project Member Reported by yyanagisawa@chromium.org, Jun 22 2016

Issue description

We already started to use commit queue with gerrit and recently we saw that CQ+2 made buildbot run even if there is a merge conflict.

Since CQ cannot merge code if there is merge conflict, I believe it should be better to fail without making buildbot run.
 
Good idea. In fact, even if bot_update did rebasing, I think CQ still shouldn't run when there is a merge conflict. Leaving Untriaged for CQ meeting, so I get more opinions.
Status: Available (was: Untriaged)
Labels: Proj-Gerrit-Migration
Owner: tandrii@chromium.org
Status: Started (was: Available)
CL: https://chromereviews.googleplex.com/489017014
Project Member

Comment 6 by bugdroid1@chromium.org, Aug 17 2016

The following revision refers to this bug:
  https://chrome-internal.googlesource.com/infra/infra_internal.git/+/c2a8a588f72bd598a0bd2660aff7d6074954d1be

commit c2a8a588f72bd598a0bd2660aff7d6074954d1be
Author: tandrii <tandrii@google.com>
Date: Wed Aug 17 15:47:47 2016

Project Member

Comment 7 by bugdroid1@chromium.org, Aug 17 2016

The following revision refers to this bug:
  https://chrome-internal.googlesource.com/infra/infra_internal.git/+/9296412d28cfc812a8ab8664d1d47a0545603a11

commit 9296412d28cfc812a8ab8664d1d47a0545603a11
Author: tandrii <tandrii@google.com>
Date: Wed Aug 17 17:12:00 2016

Project Member

Comment 8 by bugdroid1@chromium.org, Aug 17 2016

The following revision refers to this bug:
  https://chrome-internal.googlesource.com/infra/infra_internal.git/+/42524e8ed8797f8105ee45bf1dda1bda5d86f779

commit 42524e8ed8797f8105ee45bf1dda1bda5d86f779
Author: tandrii <tandrii@google.com>
Date: Wed Aug 17 18:25:25 2016

Status: Verified (was: Started)
Summary: Gerrit CQ+2 should warn if there is merge conflict. (was: CQ+2 should warn if there is merge conflict.)
Summary: Gerrit CQ+2 should abort the run if there is merge conflict. (was: Gerrit CQ+2 should warn if there is merge conflict.)
Cc: geoffl...@chromium.org phajdan.jr@chromium.org kbr@chromium.org jmad...@chromium.org
 Issue 640252  has been merged into this issue.
Labels: -Pri-2 Pri-3
Status: Started (was: Verified)
See  issue 640252 : this isn't so simple. If there are dependent CLs, all but the first one would be marked by Gerrit as "unmergable", even though from CQ/tryjob PoV they are totally fine.

So, I'm reverting my change here. A smarter way is needed and unless someone finds an easy way, IMO not worth the cost savings.
Project Member

Comment 14 by bugdroid1@chromium.org, Aug 23 2016

The following revision refers to this bug:
  https://chrome-internal.googlesource.com/infra/infra_internal.git/+/31ecb15f27bace2ee99e7bad1a55387f4d2c9d0f

commit 31ecb15f27bace2ee99e7bad1a55387f4d2c9d0f
Author: tandrii <tandrii@google.com>
Date: Tue Aug 23 19:32:48 2016

Owner: ----
Status: Available (was: Started)
Summary: Gerrit CQ should abort the run if there is merge conflict. (was: Gerrit CQ+2 should abort the run if there is merge conflict.)
I've looked at REST api of Gerrit: CQ can't rely on merge itself. There is https://review.openstack.org/Documentation/rest-api-changes.html#get-related-changes  and it might be possible to figure it out, but nowhere trivial.

We might eventually end up with some kind of auto-bot that would verify this, but for now, it's Pri3 or wontfix.
Labels: -Proj-Gerrit-Migration
Status: WontFix (was: Available)

Sign in to add a comment