<!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>[152494] 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 { 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/152494">152494</a></dd>
<dt>Author</dt> <dd>raimue@macports.org</dd>
<dt>Date</dt> <dd>2016-09-11 07:38:14 -0700 (Sun, 11 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>buildbot: builders for www and guide
This adds basic support for builders for www and guide. Both builders will
share the same build slave named "docs", which needs to be added to
slaves.json. If this slave is not available, the builders will not be added to
the master configuration.</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 (152493 => 152494)</h4>
<pre class="diff"><span>
<span class="info">--- contrib/buildbot-test/master.cfg 2016-09-11 14:22:44 UTC (rev 152493)
+++ contrib/buildbot-test/master.cfg 2016-09-11 14:38:14 UTC (rev 152494)
</span><span class="lines">@@ -43,6 +43,7 @@
</span><span class="cx">
</span><span class="cx"> path_base = "/usr/bin:/bin:/usr/sbin:/sbin"
</span><span class="cx"> path_ports = os.path.join(config['toolsprefix'], "bin") + ":" + path_base
</span><ins>+path_docs = path_ports
</ins><span class="cx">
</span><span class="cx"> # Allow spaces and tabs in property values
</span><span class="cx"> import re
</span><span class="lines">@@ -117,14 +118,29 @@
</span><span class="cx"> return True
</span><span class="cx"> return False
</span><span class="cx">
</span><ins>+def change_has_guide(change):
+ for f in change.files:
+ if f.startswith('doc-new'):
+ return True
+ return False
+
+def change_has_www(change):
+ for f in change.files:
+ if f.startswith('www'):
+ return True
+ return False
+
</ins><span class="cx"> from buildbot.changes.filter import ChangeFilter
</span><span class="cx"> portsfilter = ChangeFilter(filter_fn=change_has_ports)
</span><span class="cx"> basefilter = ChangeFilter(filter_fn=change_has_base)
</span><ins>+wwwfilter = ChangeFilter(filter_fn=change_has_www)
+guidefilter = ChangeFilter(filter_fn=change_has_guide)
</ins><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]
</span><span class="cx"> portbuilder_buildernames = ["ports-"+plat+"-builder" for plat in build_platforms if 'linux' not in plat]
</span><span class="cx"> portbuilder_triggerables = ["ports-"+plat+"-trigger" for plat in build_platforms if 'linux' not in plat]
</span><ins>+docbuilder_buildernames = ["docs-www", "docs-guide"] if "docs" in slavedata['slaves'].keys() else []
</ins><span class="cx">
</span><span class="cx"> from buildbot.schedulers.basic import SingleBranchScheduler
</span><span class="cx"> from buildbot.schedulers.forcesched import ForceScheduler
</span><span class="lines">@@ -161,7 +177,23 @@
</span><span class="cx"> label="Port list:",
</span><span class="cx"> default="",
</span><span class="cx"> size=30)
</span><del>- ])
</del><ins>+ ]),
+ SingleBranchScheduler(
+ name="www",
+ treeStableTimer=300,
+ change_filter = wwwfilter,
+ builderNames=docbuilder_buildernames),
+ SingleBranchScheduler(
+ name="guide",
+ treeStableTimer=300,
+ change_filter = guidefilter,
+ builderNames=docbuilder_buildernames),
+ ForceScheduler(
+ name="www_force",
+ builderNames=docbuilder_buildernames),
+ ForceScheduler(
+ name="guide_force",
+ builderNames=docbuilder_buildernames),
</ins><span class="cx"> ]
</span><span class="cx">
</span><span class="cx"> for i in range(len(portbuilder_buildernames)):
</span><span class="lines">@@ -433,6 +465,26 @@
</span><span class="cx"> descriptionDone=["clean"],
</span><span class="cx"> alwaysRun=True))
</span><span class="cx">
</span><ins>+
+docs_www_factory = BuildFactory()
+docs_www_factory.addStep(SVN(
+ repourl='https://svn.macports.org/repository/macports/trunk/www',
+ method="copy"))
+# TODO: validate/lint files
+# TODO: deploy generated files
+# TODO: incremental mode with cleanup?
+
+docs_guide_factory = BuildFactory()
+docs_guide_factory.addStep(SVN(
+ repourl='https://svn.macports.org/repository/macports/trunk/doc-new',
+ method="copy"))
+# TODO: check for existance of tools in toolsprefix?
+docs_guide_factory.addStep(Compile(command="make validate"))
+docs_guide_factory.addStep(Compile(command="make all"))
+# TODO: deploy generated files
+# TODO: incremental mode with cleanup?
+
+
</ins><span class="cx"> # === BUILDER CONFIGURATION ===
</span><span class="cx">
</span><span class="cx"> from buildbot.config import BuilderConfig
</span><span class="lines">@@ -473,6 +525,21 @@
</span><span class="cx"> tags=["portbuilder", os_version],
</span><span class="cx"> env={"PATH": path_ports})]
</span><span class="cx">
</span><ins>+if "docs" in slavedata['slaves'].keys():
+ c['builders'] += [
+ BuilderConfig(
+ name="docs-www",
+ slavenames=["docs"],
+ factory=docs_www_factory,
+ tags=["docs", "www"],
+ env={"PATH": path_docs}),
+ BuilderConfig(
+ name="docs-guide",
+ slavenames=["docs"],
+ factory=docs_guide_factory,
+ tags=["docs", "guide"],
+ env={"PATH": path_docs})]
+
</ins><span class="cx"> ####### STATUS TARGETS
</span><span class="cx">
</span><span class="cx"> # 'status' is a list of Status Targets. The results of each build will be
</span></span></pre>
</div>
</div>
</body>
</html>