On Tue, Nov 5, 2013 at 12:49 PM, Siebrand Mazeland (WMF) <smazeland(a)wikimedia.org> wrote: That's Bartosz's tool: https://github.com/MatmaRex/mediawikireleasenotes-driver It's great, yep. But it'd still be nice to have Jenkins handle it.

On Wed, 06 Nov 2013 09:40:59 +0100, Antoine Musso <hashar+wmf(a)free.fr> wrote: You could probably use my driver for this (linked in earlier post, also [1]), which does some mostly meaningful checks to decide if the release notes are mergeable. Yeah… JGit (which is what gerrit uses instead of git) does also supports merge drivers (or so says its documentation), it can't possibly be very hard to set one up – someone would just have to reimplement the algorithm in Java. Or maybe we could have another bot to rebase using my driver before gate-and-submit runs. But personally I have no idea if/how it could be implemented; Antoine? [1] https://github.com/MatmaRex/mediawikireleasenotes-driver -- Matma Rex

On Thu, 07 Nov 2013 19:03:33 +0100, C. Scott Ananian <cananian(a)wikimedia.org> wrote: https://www.mediawiki.org/wiki/Requests_for_comment/Release_notes_automation Merge drivers aren't nothing exceptionally fancy, and it wouldn't require much fiddling (I've already written the code that does the work and been using it since, it's perfect). But we need someone with access to appropriate parts of the infrastructure to set it up for gerrit/Jenkins, and I don't have it. -- Matma Rex

On Thu, 07 Nov 2013 19:29:06 +0100, C. Scott Ananian <cananian(a)wikimedia.org> wrote: There are two parts to the problem: 1) jenkins voting V-1 because it can't merge the change – would be trivially alleviated by installing the merge driver on it, since it uses the standard git implementation for everything. Depending how it is setup: * If it reuses one git repo, somebody would just have to copy the driver file and set some config options once. * If it creates new repos all the time, the setup would have to be made into a script – my driver actually comes as such "installer" script [1] which just needs to be run in the repo directory and then Just Works. 2) gerrit not being able to merge the changes. We can't just install the driver, because it uses JGit (a git implementation in Java). We could do two things here too: * Rewrite my merge plugin in Java to work with JGit, once it's made to support them. This is apparently ongoing work [2], I'm sure they'd be happy to receive help. * Have jenkins rebase each change as part of the gate-and-submit pipeline using the merge driver we installed on it per 1). This would also make the history graph prettier by getting rid of merge commits (the graph currently looks like [3]…), which I've heard Chad in particular wants very much. This really isn't insurmountable, but nobody who is able to do any of these things seems to care :( [1] https://github.com/MatmaRex/mediawikireleasenotes-driver/blob/master/mediaw… [2] https://bugs.eclipse.org/bugs/show_bug.cgi?id=418149 [3] http://i.imgur.com/OmFyFbi.png -- Matma Rex