<!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>[152490] contrib/buildbot-test</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/152490">152490</a></dd>
<dt>Author</dt> <dd>raimue@macports.org</dd>
<dt>Date</dt> <dd>2016-09-11 05:34:55 -0700 (Sun, 11 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>buildbot: move build platforms to slaves.json</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#contribbuildbottestmastercfg">contrib/buildbot-test/master.cfg</a></li>
<li><a href="#contribbuildbottestslavesjsonsample">contrib/buildbot-test/slaves.json.sample</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="contribbuildbottestmastercfg"></a>
<div class="modfile"><h4>Modified: contrib/buildbot-test/master.cfg (152489 => 152490)</h4>
<pre class="diff"><span>
<span class="info">--- contrib/buildbot-test/master.cfg 2016-09-11 11:07:27 UTC (rev 152489)
+++ contrib/buildbot-test/master.cfg 2016-09-11 12:34:55 UTC (rev 152490)
</span><span class="lines">@@ -43,9 +43,6 @@
</span><span class="cx"> path_base = "/usr/bin:/bin:/usr/sbin:/sbin"
</span><span class="cx"> path_ports = os.path.join(toolsprefix, "bin") + ":" + path_base
</span><span class="cx">
</span><del>-# TODO: the following list should be configured in slaves.json
-build_platforms = ["10.6_x86_64", "10.6_x86_64_legacy", "10.6_i386", "10.6_i386_legacy", "10.7_x86_64", "10.7_x86_64_legacy", "10.8_x86_64", "10.8_x86_64_legacy", "10.9_x86_64", "10.10_x86_64", "10.11_x86_64"]
-
</del><span class="cx"> # Allow spaces and tabs in property values
</span><span class="cx"> import re
</span><span class="cx"> c['validation'] = {
</span><span class="lines">@@ -64,7 +61,11 @@
</span><span class="cx">
</span><span class="cx"> with open(_path('slaves.json')) as f:
</span><span class="cx"> slavedata = json.load(f)
</span><del>-for slave, pwd in slavedata.items():
</del><ins>+
+# convert unicode to byte strings
+build_platforms = [s.encode('utf-8') for s in slavedata['build_platforms']]
+
+for slave, pwd in slavedata['slaves'].items():
</ins><span class="cx"> c['slaves'].append(BuildSlave(slave, pwd))
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -438,7 +439,7 @@
</span><span class="cx"> # XXX: slavenames assignment should be automatic and more generic
</span><span class="cx"> portsslaves = {}
</span><span class="cx"> baseslaves = {}
</span><del>-slavenames = slavedata.keys()
</del><ins>+slavenames = slavedata['slaves'].keys()
</ins><span class="cx"> for plat in build_platforms:
</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></pre></div>
<a id="contribbuildbottestslavesjsonsample"></a>
<div class="modfile"><h4>Modified: contrib/buildbot-test/slaves.json.sample (152489 => 152490)</h4>
<pre class="diff"><span>
<span class="info">--- contrib/buildbot-test/slaves.json.sample 2016-09-11 11:07:27 UTC (rev 152489)
+++ contrib/buildbot-test/slaves.json.sample 2016-09-11 12:34:55 UTC (rev 152490)
</span><span class="lines">@@ -1,19 +1,34 @@
</span><span class="cx"> {
</span><del>- "base-10.6_x86_64": "",
- "ports-10.6_i386": "",
- "ports-10.6_i386_legacy": "",
- "ports-10.6_x86_64": "",
- "ports-10.6_x86_64_legacy": "",
- "base-10.7_x86_64": "",
- "ports-10.7_x86_64": "",
- "ports-10.7_x86_64_legacy": "",
- "base-10.8_x86_64": "",
- "ports-10.8_x86_64": "",
- "ports-10.8_x86_64_legacy": "",
- "base-10.9_x86_64": "",
- "ports-10.9_x86_64": "",
- "base-10.10_x86_64": "",
- "ports-10.10_x86_64": "",
- "base-10.11_x86_64": "",
- "ports-10.11_x86_64": ""
</del><ins>+ "build_platforms": [
+ "10.6_x86_64",
+ "10.6_x86_64_legacy",
+ "10.6_i386",
+ "10.6_i386_legacy",
+ "10.7_x86_64",
+ "10.7_x86_64_legacy",
+ "10.8_x86_64",
+ "10.8_x86_64_legacy",
+ "10.9_x86_64",
+ "10.10_x86_64",
+ "10.11_x86_64"
+ ],
+ "slaves": {
+ "base-10.6_x86_64": "",
+ "ports-10.6_i386": "",
+ "ports-10.6_i386_legacy": "",
+ "ports-10.6_x86_64": "",
+ "ports-10.6_x86_64_legacy": "",
+ "base-10.7_x86_64": "",
+ "ports-10.7_x86_64": "",
+ "ports-10.7_x86_64_legacy": "",
+ "base-10.8_x86_64": "",
+ "ports-10.8_x86_64": "",
+ "ports-10.8_x86_64_legacy": "",
+ "base-10.9_x86_64": "",
+ "ports-10.9_x86_64": "",
+ "base-10.10_x86_64": "",
+ "ports-10.10_x86_64": "",
+ "base-10.11_x86_64": "",
+ "ports-10.11_x86_64": ""
+ }
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>