<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[154412] contrib/buildbot-test/master.cfg</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/154412">154412</a></dd>
<dt>Author</dt> <dd>larryv@macports.org</dd>
<dt>Date</dt> <dd>2016-10-29 02:46:22 +0200 (Sat, 29 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>buildbot: Clean up change filters
- The ChangeFilters are only used once each, so instantiate them when
they're needed.
- Rewrite the port test into a function we can reuse.
- Reduce `change_has_ports` to a lambda.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#contribbuildbottestmastercfg">contrib/buildbot-test/master.cfg</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="contribbuildbottestmastercfg"></a>
<div class="modfile"><h4>Modified: contrib/buildbot-test/master.cfg (154411 => 154412)</h4>
<pre class="diff"><span>
<span class="info">--- contrib/buildbot-test/master.cfg 2016-10-29 00:29:14 UTC (rev 154411)
+++ contrib/buildbot-test/master.cfg 2016-10-29 00:46:22 UTC (rev 154412)
</span><span class="lines">@@ -20,7 +20,18 @@
</span><span class="cx"> res.update(d)
</span><span class="cx"> return res
</span><span class="cx">
</span><ins>+def port_from_path(path, sep='/'):
+ components = path.split(sep)
+ try:
+ if (components[0] == 'dports' and components[1] != '_resources'
+ and components[3] in ('Portfile', 'files')):
+ return components[2]
+ except IndexError:
+ pass
+ # Might be better to throw a custom exception here?
+ return None
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> # This is the dictionary that the buildmaster pays attention to. We also use
</span><span class="cx"> # a shorter alias to save typing.
</span><span class="cx"> c = BuildmasterConfig = {}
</span><span class="lines">@@ -107,18 +118,9 @@
</span><span class="cx"> category='macports',
</span><span class="cx"> project='ports')
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> ####### SCHEDULERS #######
</span><span class="cx">
</span><del>-def change_has_ports(change):
- for f in change.files:
- if '_resources' in f:
- continue
- # should actually skip changes to files/ only, but only if we know the
- # last build of the port succeeded
- if 'dports' in f and ('Portfile' in f or 'files' in f):
- return True
- return False
-
</del><span class="cx"> def change_has_base(change):
</span><span class="cx"> for f in change.files:
</span><span class="cx"> if f.startswith('base'):
</span><span class="lines">@@ -138,10 +140,6 @@
</span><span class="cx"> return False
</span><span class="cx">
</span><span class="cx"> from buildbot.changes.filter import ChangeFilter
</span><del>-portsfilter = ChangeFilter(filter_fn=change_has_ports)
-basefilter = ChangeFilter(filter_fn=change_has_base)
-wwwfilter = ChangeFilter(filter_fn=change_has_www)
-guidefilter = ChangeFilter(filter_fn=change_has_guide)
</del><span class="cx">
</span><span class="cx"> base_buildernames = ['base-'+plat for plat in build_platforms if 'legacy' not in plat and '10.6_i386' not in plat]
</span><span class="cx"> portwatcher_buildernames = ['ports-'+plat+'-watcher' for plat in build_platforms if 'linux' not in plat and '10.5_ppc' != plat]
</span><span class="lines">@@ -157,12 +155,16 @@
</span><span class="cx"> SingleBranchScheduler(
</span><span class="cx"> name='base',
</span><span class="cx"> treeStableTimer=None,
</span><del>- change_filter=basefilter,
</del><ins>+ change_filter=ChangeFilter(
+ filter_fn=change_has_base),
</ins><span class="cx"> builderNames=base_buildernames),
</span><span class="cx"> SingleBranchScheduler(
</span><span class="cx"> name='ports',
</span><span class="cx"> treeStableTimer=None,
</span><del>- change_filter=portsfilter,
</del><ins>+ change_filter=ChangeFilter(
+ # Should actually skip changes to files/ only, but only if
+ # we know the last build of the port succeeded.
+ filter_fn=lambda change: any(port_from_path(f) for f in change.files)),
</ins><span class="cx"> builderNames=portwatcher_buildernames),
</span><span class="cx"> ForceScheduler(
</span><span class="cx"> name='base_force',
</span><span class="lines">@@ -193,7 +195,8 @@
</span><span class="cx"> SingleBranchScheduler(
</span><span class="cx"> name='www',
</span><span class="cx"> treeStableTimer=300,
</span><del>- change_filter=wwwfilter,
</del><ins>+ change_filter=ChangeFilter(
+ filter_fn=change_has_www),
</ins><span class="cx"> builderNames=['docs-www']),
</span><span class="cx"> ForceScheduler(
</span><span class="cx"> name='www_force',
</span><span class="lines">@@ -205,7 +208,8 @@
</span><span class="cx"> SingleBranchScheduler(
</span><span class="cx"> name='guide',
</span><span class="cx"> treeStableTimer=300,
</span><del>- change_filter=guidefilter,
</del><ins>+ change_filter=ChangeFilter(
+ filter_fn=change_has_guide),
</ins><span class="cx"> builderNames=['docs-guide']),
</span><span class="cx"> ForceScheduler(
</span><span class="cx"> name='guide_force',
</span></span></pre>
</div>
</div>
</body>
</html>