<!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>[146810] 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/146810">146810</a></dd>
<dt>Author</dt> <dd>mojca@macports.org</dd>
<dt>Date</dt> <dd>2016-03-18 05:58:23 -0700 (Fri, 18 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>buildbot-test: mostly whitespace changes and commas</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 (146809 => 146810)</h4>
<pre class="diff"><span>
<span class="info">--- contrib/buildbot-test/master.cfg 2016-03-18 12:16:24 UTC (rev 146809)
+++ contrib/buildbot-test/master.cfg 2016-03-18 12:58:23 UTC (rev 146810)
</span><span class="lines">@@ -5,7 +5,6 @@
</span><span class="cx"> import json
</span><span class="cx"> import os
</span><span class="cx">
</span><del>-
</del><span class="cx"> def _path(name):
</span><span class="cx"> return os.path.join(os.path.dirname(__file__), name)
</span><span class="cx">
</span><span class="lines">@@ -20,29 +19,25 @@
</span><span class="cx"> # (where /opt/local shouldn't be messed with) and the production server (where
</span><span class="cx"> # it has to be)
</span><span class="cx">
</span><del>-production = False
-privkey = ''
-slaveport = 9989
-httpport = 8010
-buildboturl = "http://localhost:8010/"
</del><ins>+production = False
+privkey = ''
+slaveport = 9989
+httpport = 8010
+buildboturl = "http://localhost:8010/"
</ins><span class="cx"> htpasswdfile = "htpasswd"
</span><del>-mpbbsvnurl = "https://svn.macports.org/repository/macports/contrib/mp-buildbot"
</del><ins>+mpbbsvnurl = "https://svn.macports.org/repository/macports/contrib/mp-buildbot"
</ins><span class="cx">
</span><span class="cx"> if os.path.exists(_path('config.json')):
</span><span class="cx"> with open(_path('config.json')) as f:
</span><span class="cx"> configdata = json.load(f)
</span><del>- locals = locals()
- for key in ["production", "privkey", "slaveport", "httpport", "buildboturl", "htpasswdfile", "mpbbsvnurl"]:
- if configdata[key]:
- locals[key] = configdata[key]
</del><ins>+ locals = locals()
+ for key in ["production", "privkey", "slaveport", "httpport", "buildboturl", "htpasswdfile", "mpbbsvnurl"]:
+ if configdata[key]:
+ locals[key] = configdata[key]
</ins><span class="cx">
</span><del>-# platforms we are building for
-if production:
- # this list should get longer in future
- #build_platforms = ["snowleopard-x86_64", "lion-x86_64", "mtln-x86_64", "mavericks-x86_64", "yosemite-x86_64", "elcapitan-x86_64", "oelinux-6.3-x86_64"]
- build_platforms = []
-else:
- build_platforms = ["10.6-x86_64","10.9-x86_64"]
</del><ins>+# TODO: the following list should be configured in slaves.json
+build_platforms = ["10.6-x86_64"]
+#build_platforms = ["snowleopard-x86_64", "lion-x86_64", "mtln-x86_64", "mavericks-x86_64", "yosemite-x86_64", "elcapitan-x86_64", "oelinux-6.3-x86_64"]
</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">@@ -80,6 +75,7 @@
</span><span class="cx"> # notifications from a post-commit script) should be used in production
</span><span class="cx">
</span><span class="cx"> if production:
</span><ins>+ # TODO
</ins><span class="cx"> from buildbot.changes.pb import PBChangeSource
</span><span class="cx"> sourcedata = []
</span><span class="cx"> # with open(_path('source.json')) as f:
</span><span class="lines">@@ -88,14 +84,12 @@
</span><span class="cx"> else:
</span><span class="cx"> from buildbot.changes.svnpoller import SVNPoller
</span><span class="cx"> c['change_source'] = (SVNPoller(
</span><del>- svnurl='https://svn.macports.org/repository/macports/trunk',
- #'https://svn.macports.org/repository/macports/trunk',
- #svnbin='/opt/local/bin/svn',
- pollinterval=300,
- category='macports',
- project='ports',
- ),
- )
</del><ins>+ svnurl='https://svn.macports.org/repository/macports/trunk',
+ #'https://svn.macports.org/repository/macports/trunk',
+ #svnbin='/opt/local/bin/svn',
+ pollinterval=300,
+ category='macports',
+ project='ports'))
</ins><span class="cx">
</span><span class="cx"> ####### SCHEDULERS
</span><span class="cx">
</span><span class="lines">@@ -298,12 +292,12 @@
</span><span class="cx"> # XXX: move deploy_archives.sh functionality to mp-buildbot
</span><span class="cx"> # sign generated binaries and sync to download server (if distributable)
</span><span class="cx"> #if production:
</span><del>- #portbuilder_factory.addStep(MasterShellCommand(command=["./deploy_archives.sh", WithProperties(ulpath_unique)],
- # name="deploy archives",
- # description="deploy archives",
- # env={'PRIVKEY': privkey,
- # 'DLHOST': dlhost,
- # 'DLPATH': dlpath}))
</del><ins>+# portbuilder_factory.addStep(MasterShellCommand(command=["./deploy_archives.sh", WithProperties(ulpath_unique)],
+# name="deploy archives",
+# description="deploy archives",
+# env={'PRIVKEY': privkey,
+# 'DLHOST': dlhost,
+# 'DLPATH': dlpath}))
</ins><span class="cx">
</span><span class="cx"> # TODO: do we want to upload the individual logs so maintainers can review them?
</span><span class="cx"> #ports_factory.addStep(ShellCommand(command="./cleanup_old.sh",
</span><span class="lines">@@ -332,19 +326,23 @@
</span><span class="cx">
</span><span class="cx"> c['builders']=[]
</span><span class="cx"> for plat in build_platforms:
</span><del>- c['builders']+= [BuilderConfig(name="base-"+plat,
- slavenames=["base-"+plat],
- factory=base_factory,
- env={"PATH": "/usr/bin:/bin:/usr/sbin:/sbin"})]
- if 'linux' not in plat:
- c['builders']+= [BuilderConfig(name="portwatcher-"+plat,
- slavenames=[plat],
- factory=make_portwatcher_factory("triggerable-portbuilder-"+plat),
- env={"PATH": "/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin"})]
- c['builders']+= [BuilderConfig(name="portbuilder-"+plat,
- slavenames=[plat],
- factory=portbuilder_factory,
- env={"PATH": tools_prefix+"/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin"})]
</del><ins>+ c['builders'] += [BuilderConfig(
+ name="base-" + plat,
+ slavenames=["base-" + plat],
+ factory=base_factory,
+ env={"PATH": "/usr/bin:/bin:/usr/sbin:/sbin"})]
+ if 'linux' not in plat:
+ c['builders'] += [
+ BuilderConfig(
+ name="portwatcher-" + plat,
+ slavenames=[plat],
+ factory=make_portwatcher_factory("triggerable-portbuilder-" + plat),
+ env={"PATH": "/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin"}),
+ BuilderConfig(
+ name="portbuilder-" + plat,
+ slavenames=[plat],
+ factory=portbuilder_factory,
+ env={"PATH": tools_prefix + "/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin"})]
</ins><span class="cx">
</span><span class="cx"> ####### STATUS TARGETS
</span><span class="cx">
</span><span class="lines">@@ -392,7 +390,7 @@
</span><span class="cx"> failedPorts = set()
</span><span class="cx"> interestedUsers = set()
</span><span class="cx">
</span><del>- # XXX: needs to be rewritten for the new steps of mp-buildbot
</del><ins>+ # XXX: needs to be rewritten for the new steps of mp-buildbot
</ins><span class="cx"> statusStep = [x for x in build.getSteps() if x.getName() == "status"][0]
</span><span class="cx"> statusLog = [x for x in statusStep.getLogs() if x.getName() == "portstatus"][0]
</span><span class="cx"> for line in statusLog.getText().splitlines():
</span><span class="lines">@@ -443,11 +441,6 @@
</span><span class="cx">
</span><span class="cx"> ####### DB URL
</span><span class="cx">
</span><del>-# This specifies what database buildbot uses to store change and scheduler
-# state. You can leave this at its default for all but the largest
-# installations.
-#c['db_url'] = "sqlite:///state.sqlite"
-
</del><span class="cx"> c['db'] = {
</span><span class="cx"> # This specifies what database buildbot uses to store its state. You can leave
</span><span class="cx"> # this at its default for all but the largest installations.
</span></span></pre></div>
<a id="contribbuildbottestslavesjsonsample"></a>
<div class="modfile"><h4>Modified: contrib/buildbot-test/slaves.json.sample (146809 => 146810)</h4>
<pre class="diff"><span>
<span class="info">--- contrib/buildbot-test/slaves.json.sample 2016-03-18 12:16:24 UTC (rev 146809)
+++ contrib/buildbot-test/slaves.json.sample 2016-03-18 12:58:23 UTC (rev 146810)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><span class="cx"> {
</span><span class="cx"> "base-10.6-x86_64": "***",
</span><del>- "10.6-x86_64": "***",
</del><ins>+ "10.6-x86_64": "***"
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>