#329 Zuul: Keep showing the CI result even when a PR conflicts.
Opened 2 years ago by jaruga. Modified 2 years ago

CC: @vondruch

We think Zuul CI should keep running and showing the CI result even when a pull-request's branch can be merged, and has a conflict. Because we work on a PR in parallel. The target branch (rawhide branch) is always updated. And this is not the behavior of GitHub Actions and other CIs.

Here is one of the cases.
https://src.fedoraproject.org/rpms/ruby/pull-request/106#comment-92955

@fbo just for the context, this PR won't be ever merged and I don't want to resolve every time the silly merge conflicts caused by release and changelog changes.

What do you think?


The Zuul concept is to always rebase a change on the tip of the target branch in order to be properly tested. I don't see in the Zuul documentation a way to deactivate this behavior. From https://zuul-ci.org/docs/zuul/latest/concepts.html

The items enqueued into a pipeline are each associated with a git ref. That ref may point to a proposed change, or it may be the tip of a branch or a tag. The triggering event determines the ref, and whether it represents a proposed or merged commit. Zuul prepares the ref for an item before running jobs. In the case of a proposed change, that means speculatively merging the change into its target branch. This means that any jobs that operate on the change will run with the git repo in the state it will be in after the change merges (which may be substantially different than the git repo state of the change itself since the repo may have merged other changes since the change was originally authored). Items in a pipeline may depend on other items, and if they do, all of their dependent changes will be included in the git repo state that Zuul prepares. For more detail on this process, see Project Gating and Cross-Project Dependencies.

Metadata Update from @fbo:
- Issue tagged with: Zuul CI

2 years ago

I see. Do you know where is the Zuul upstream? Seeing the document: https://zuul-ci.org/docs/zuul/latest/index.html , this https://github.com/Netflix/zuul ? I am happy to ask this feature request to the upstream.

All info to contact upstream are located in that page https://zuul-ci.org/community.html

Thanks for the info. I created an issue ticket here for the upstream.

Zuul: Running checks even when a PR conflicts.
https://storyboard.openstack.org/#!/story/2009923

FWIW, %autorelease and %autochangelog are kinda intended to help with this problem. Another approach is to not bump release and changelog in PRs, just include the functional changes, and leave release/changelog bumps to the maintainer after PRs are merged.

Release and changelogs are just minor part of the issue.

Login to comment on this ticket.

Metadata