Le 29/06/13 02:59, Roan Kattouw a écrit :
> * Attempt to merge the branch into master
> * If there is a conflict, reject the commit with a message saying
> something about a merge conflict, and abort
> * If there was no conflict, there is now a local (to the Jenkins
> server) merge commit that merges this branch into master
> * Run tests on this merge commit

That is exactly how Zuul handles it.

While rebasing the change https://gerrit.wikimedia.org/r/#/c/69585/
(PS3) I noticed the unit tests were not being run.  I fixed the
configuration of that extension in Zuul and resent a new patchset.

Test is still failing though :-]

-- 
Antoine "hashar" Musso


_______________________________________________
Wikitech-l mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/wikitech-l

Reply via email to