15ef181d26
The current Gerrit simulated merge operation simply resets the target branch to the specified change's commit -- it doesn't actually perform a git merge operation as gerrit (typically) would. This makes some test situations difficult, such as when we want to rely on a post-merge pipeline preparing git repos on top of previously merged changes. This change actually performs git merge operations when gerrit changes are merged in tests, so the result should be far more realistic. One test relied on a side effect of the old behavior: test_zuul_trigger_project_change_merged This test merges change A and then performed a merge check on change B, which conflicts, and then reports Verified -1. It then repeats the test by merging change D which conflicts with change E which should also receive Verified -1. However, the test inadvertently ran a second merge check on change B when change D merged, but because it tested D as written instead of merged on top of A after A was merged, the conflict of B against A was not seen (because B does not conflict with D) and therefore not rported. With this patch, the conflict of B against the merged change A is seen and the test failed because it reported B's merge conflict twice. To correct this, we make the test even more realistic by adding a pipeline requirement that we have not already reported Verified -1 in order to enqueue a change for merge-check. In order for this to work, we need to make sure Zuul sees the comment-added events for the Verified -1 votes (so that the Gerrit driver updates its view of the votes on the change), so those are added to the test. Change-Id: Ia5b4b83096de3b8719c8b6d256e8e33749e7a5b8
Zuul
Zuul is a project gating system.
The latest documentation for Zuul v3 is published at: https://zuul-ci.org/docs/zuul/
If you are looking for the Edge routing service named Zuul that is related to Netflix, it can be found here: https://github.com/Netflix/zuul
If you are looking for the Javascript testing tool named Zuul, it can be found here: https://github.com/defunctzombie/zuul
Getting Help
There are two Zuul-related mailing lists:
- zuul-announce
-
A low-traffic announcement-only list to which every Zuul operator or power-user should subscribe.
- zuul-discuss
-
General discussion about Zuul, including questions about how to use it, and future development.
You will also find Zuul developers in the #zuul channel on Freenode IRC.
Contributing
To browse the latest code, see: https://opendev.org/zuul/zuul To clone the latest code, use git clone https://opendev.org/zuul/zuul
Bugs are handled at: https://storyboard.openstack.org/#!/project/zuul/zuul
Suspected security vulnerabilities are most appreciated if first reported privately following any of the supported mechanisms described at https://zuul-ci.org/docs/zuul/user/vulnerabilities.html
Code reviews are handled by gerrit at https://review.opendev.org
After creating a Gerrit account, use git review to submit patches. Example:
# Do your commits
$ git review
# Enter your username if promptedJoin #zuul on Freenode to discuss development or usage.
License
Zuul is free software. Most of Zuul is licensed under the Apache License, version 2.0. Some parts of Zuul are licensed under the General Public License, version 3.0. Please see the license headers at the tops of individual source files.
Python Version Support
Zuul requires Python 3. It does not support Python 2.
Since Zuul uses Ansible to drive CI jobs, Zuul can run tests anywhere Ansible can, including Python 2 environments.