Hi Carlos! It looks like there are a mix of issues here…
First… the old svn commit hook never sent along changes to buildbot for anything that wasn’t in “trunk” or “branches”. So, the fact you were not getting triggers for anything outside of these branches was an error in the previous version of the script. I’m a bit shocked this is just now being discovered… we must never have had a builder working against anything other than “trunk" or “branches”. Moving forward: The new svn_buildbot.py does properly send along changes to any branch. However, it looks like it has a few problems, which I plan to fix up. I’m about to fix the hook, and thus should get appropriate branch name passed along to buildbot from the commit hook. (Right now, trunk and branch commits also get ‘None’) I think your code change below should also be landed. But not until the post-commit hook is fixed, otherwise I believe no changes will be triggered. Lucas > On May 4, 2017, at 3:55 PM, Carlos Alberto Lopez Perez <[email protected]> > wrote: > > On 05/05/17 00:24, Lucas Forschler wrote: >> Hi Carlos! >> >> I recently updated the svn post commit hook to use the newest version of >> svn_buildbot.py from >> https://github.com/buildbot/buildbot-contrib/blob/master/master/contrib/svn_buildbot.py >> >> <https://github.com/buildbot/buildbot-contrib/blob/master/master/contrib/svn_buildbot.py> >> >> I am going to look through the diff now to see if there are any obvious >> changes which would cause this. >> Thanks for bringing it to our attention! >> >> Lucas > > Its ok that the svn_buildbot script sends changes about any branches. > > But the buildbot config should only trigger branches for changes on > trunk due to the change_filter": "trunk_filter" below: > > https://trac.webkit.org/browser/webkit/trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg?rev=216213#L954 > > https://trac.webkit.org/browser/trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json?rev=216213#L353 > > Maybe the issue is that the new svn_buildbot scripts fails to identify the > branch name > (for WebKitGTK+ we use a non-standard branch name: "releases") and sends the > changes with > branch "None"? > > Maybe the patch below fixes the issue? > > --- a/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg > +++ b/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg > @@ -951,7 +951,7 @@ class PlatformSpecificScheduler(AnyBranchScheduler): > def filter(self, change): > return wkbuild.should_build(self.platform, change.files) > > -trunk_filter = ChangeFilter(branch=["trunk", None]) > +trunk_filter = ChangeFilter(branch="trunk") > > def loadBuilderConfig(c): > # FIXME: These file handles are leaked. > > _______________________________________________ webkit-dev mailing list [email protected] https://lists.webkit.org/mailman/listinfo/webkit-dev
