<!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>[152554] 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/152554">152554</a></dd>
<dt>Author</dt> <dd>raimue@macports.org</dd>
<dt>Date</dt> <dd>2016-09-12 07:48:39 -0700 (Mon, 12 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>buildbot: add buildbot metadata to build env
In order to construct references current build, add buildername, buildnumber
and a URL to this build to the build environment.</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 (152553 => 152554)</h4>
<pre class="diff"><span>
<span class="info">--- contrib/buildbot-test/master.cfg 2016-09-12 14:24:19 UTC (rev 152553)
+++ contrib/buildbot-test/master.cfg 2016-09-12 14:48:39 UTC (rev 152554)
</span><span class="lines">@@ -9,6 +9,12 @@
</span><span class="cx"> def _path(name):
</span><span class="cx"> return os.path.join(os.path.dirname(__file__), name)
</span><span class="cx">
</span><ins>+def merge_dicts(*dicts):
+ res = {}
+ for d in dicts:
+ res.update(d)
+ return res
+
</ins><span class="cx"> # This is a buildmaster config file. It must be installed as
</span><span class="cx"> # 'master.cfg' in your buildmaster's base directory.
</span><span class="cx">
</span><span class="lines">@@ -296,7 +302,7 @@
</span><span class="cx"> from buildbot.process.properties import renderer
</span><span class="cx">
</span><span class="cx"> @renderer
</span><del>-def make_triggeredby_url(props):
</del><ins>+def make_build_url(props):
</ins><span class="cx"> buildername = props.getProperty('buildername')
</span><span class="cx"> buildnumber = props.getProperty('buildnumber')
</span><span class="cx"> url = c['buildbotURL']
</span><span class="lines">@@ -379,7 +385,7 @@
</span><span class="cx">
</span><span class="cx"> portwatcher_factory.addStep(TriggerWithPortlist(
</span><span class="cx"> schedulerNames=[triggerable],
</span><del>- set_properties={"triggered_by": make_triggeredby_url},
</del><ins>+ set_properties={"triggered_by": make_build_url},
</ins><span class="cx"> waitForFinish=True,
</span><span class="cx"> updateSourceStamp=True))
</span><span class="cx">
</span><span class="lines">@@ -483,6 +489,12 @@
</span><span class="cx"> baseslaves[plat] = filter(lambda x: x.endswith(plat+"-base"), slavenames)
</span><span class="cx"> portsslaves[plat] = filter(lambda x: x.endswith(plat+"-ports"), slavenames)
</span><span class="cx">
</span><ins>+env_buildinfo = {
+ "BUILDBOT_BUILDERNAME": WithProperties("%(buildername)s"),
+ "BUILDBOT_BUILDNUMBER": WithProperties("%(buildnumber)s"),
+ "BUILDBOT_BUILDURL": make_build_url
+}
+
</ins><span class="cx"> c['builders']=[]
</span><span class="cx"> extract_os = re.compile("10\.\d+")
</span><span class="cx"> for plat in build_platforms:
</span><span class="lines">@@ -495,7 +507,7 @@
</span><span class="cx"> slavenames=["base-" + plat],
</span><span class="cx"> factory=base_factory,
</span><span class="cx"> tags=["base", os_version],
</span><del>- env={"PATH": path_base})]
</del><ins>+ env=merge_dicts(env_buildinfo, {"PATH": path_base}))]
</ins><span class="cx"> if 'linux' not in plat and '10.5_ppc' != plat:
</span><span class="cx"> c['builders'] += [
</span><span class="cx"> BuilderConfig(
</span><span class="lines">@@ -503,13 +515,13 @@
</span><span class="cx"> slavenames=["ports-" + plat],
</span><span class="cx"> factory=make_portwatcher_factory("ports-" + plat + "-trigger"),
</span><span class="cx"> tags=["portwatcher", os_version],
</span><del>- env={"PATH": path_ports}),
</del><ins>+ env=merge_dicts(env_buildinfo, {"PATH": path_ports})),
</ins><span class="cx"> BuilderConfig(
</span><span class="cx"> name="ports-" + plat + "-builder",
</span><span class="cx"> slavenames=["ports-" + plat],
</span><span class="cx"> factory=portbuilder_factory,
</span><span class="cx"> tags=["portbuilder", os_version],
</span><del>- env={"PATH": path_ports})]
</del><ins>+ env=merge_dicts(env_buildinfo, {"PATH": path_ports}))]
</ins><span class="cx">
</span><span class="cx"> if "docs" in slavedata['slaves'].keys():
</span><span class="cx"> c['builders'] += [
</span><span class="lines">@@ -518,13 +530,13 @@
</span><span class="cx"> slavenames=["docs"],
</span><span class="cx"> factory=docs_www_factory,
</span><span class="cx"> tags=["docs", "www"],
</span><del>- env={"PATH": path_docs}),
</del><ins>+ env=merge_dicts(env_buildinfo, {"PATH": path_ports})),
</ins><span class="cx"> BuilderConfig(
</span><span class="cx"> name="docs-guide",
</span><span class="cx"> slavenames=["docs"],
</span><span class="cx"> factory=docs_guide_factory,
</span><span class="cx"> tags=["docs", "guide"],
</span><del>- env={"PATH": path_docs})]
</del><ins>+ env=merge_dicts(env_buildinfo, {"PATH": path_ports}))]
</ins><span class="cx">
</span><span class="cx"> ####### STATUS TARGETS
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>