https://bugzilla.wikimedia.org/show_bug.cgi?id=45719
--- Comment #4 from Krinkle <krinklem...@gmail.com> --- (In reply to comment #3) > Is there a config setting per project? I wouldn't want to change the default > for other repositories without a community discussion. FWIW, I found Chad's > original announcement of this feature here, > http://www.gossamer-threads.com/lists/wiki/wikitech/321317 -- I guess the > confusion is caused by not having a precise definition of "Verified+2"? > > Anyway, IMO a bot should never merge, there should be explicit user action. The explicit user action is "CR+2". Don't be fooled by terminology ("review" and "merge"). The design is that things should be tested before merging. And since we can't hook (yet?) hook into the "Merge" button in Gerrit, we instead hook into the "CR+2" submission button, and let Jenkins merge it. So basically it is this: - User reviews - User approves merge - Bot tests code - Bot lets merge happen or aborts it Similar to how an extension can hook into an action in MediaWiki, and if the hook returns false it action is aborted, and if it returns true it is allowed. However, due to the way Gerrit and Zuul work, you need to be aware of how these buttons work. So while our intention is this: * Users does CR -2, -1, 0, +1, +2 * User does Merge. Only merge if you intend to merge, otherwise leave comment with CR+2. * If no CR+2, abort * On Merge: Run tests, if fail, disallow merge, otherwise continue The actual buttons to be used are like this: * Users does CR -2, -1, 0, +1, +2 * User does CR+2. Only CR+2 if you intend to merge, otherwise leave comment with CR+1. * On CR+2: Run tests, if fail, score V-2, otherwise merge This is naturally confusing when not familiar with this fact. Which is +2 is only available to people who are expected to know this, and even of those people most people do not have access to the form for "Verified" score (just Code-Review score), and only have a "Publish score/comments" button, not a "Submit change" (merge) button. -- You are receiving this mail because: You are on the CC list for the bug. You are the assignee for the bug. You are watching all bug changes. _______________________________________________ Wikibugs-l mailing list Wikibugs-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikibugs-l
