<!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>[151107] 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/151107">151107</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2016-08-07 08:55:33 -0700 (Sun, 07 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>buildbot-test: update descriptions and move cleanup step last</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 (151106 => 151107)</h4>
<pre class="diff"><span>
<span class="info">--- contrib/buildbot-test/master.cfg 2016-08-07 15:51:50 UTC (rev 151106)
+++ contrib/buildbot-test/master.cfg 2016-08-07 15:55:33 UTC (rev 151107)
</span><span class="lines">@@ -88,7 +88,6 @@
</span><span class="cx"> from buildbot.changes.svnpoller import SVNPoller
</span><span class="cx"> c['change_source'] = (SVNPoller(
</span><span class="cx"> svnurl='https://svn.macports.org/repository/macports/trunk',
</span><del>- #'https://svn.macports.org/repository/macports/trunk',
</del><span class="cx"> #svnbin='/opt/local/bin/svn',
</span><span class="cx"> pollinterval=300,
</span><span class="cx"> category='macports',
</span><span class="lines">@@ -198,21 +197,21 @@
</span><span class="cx"> base_factory.addStep(ShellCommand(
</span><span class="cx"> command="make install",
</span><span class="cx"> name="install",
</span><del>- description="install"))
</del><ins>+ description=["installing"],
+ descriptionDone=["install"]))
</ins><span class="cx"> base_factory.addStep(ShellCommand(
</span><span class="cx"> command="make test",
</span><span class="cx"> name="test",
</span><del>- description="test"))
</del><ins>+ description=["testing"],
+ descriptionDone=["test"]))
</ins><span class="cx"> base_factory.addStep(ShellCommand(
</span><span class="cx"> command=WithProperties("make distclean; rm -rf %(workdir)s/opt/local"),
</span><span class="cx"> name="clean",
</span><del>- description="clean"))
</del><ins>+ description=["cleaning"],
+ descriptionDone=["clean"]))
</ins><span class="cx">
</span><span class="cx"> # custom class to make the file list available on the slave...
</span><span class="cx"> class SetPropertyFromCommandWithPortlist(SetPropertyFromCommand):
</span><del>- name = 'generate portlist'
- description = 'generate portlist'
-
</del><span class="cx"> def setBuild(self, build):
</span><span class="cx"> SetPropertyFromCommand.setBuild(self, build)
</span><span class="cx">
</span><span class="lines">@@ -298,14 +297,16 @@
</span><span class="cx"> portwatcher_factory.addStep(ShellCommand(
</span><span class="cx"> command=['./mpbb/mpbb', 'selfupdate', '--prefix', WithProperties(prefix)],
</span><span class="cx"> name="selfupdate",
</span><del>- description="selfupdate",
</del><ins>+ description=["updating", "MacPorts"],
+ descriptionDone=["update", "MacPorts"],
</ins><span class="cx"> haltOnFailure=True))
</span><span class="cx">
</span><span class="cx"> portwatcher_factory.addStep(ShellCommand(
</span><span class="cx"> command=['./mpbb/mpbb', 'checkout', '--prefix', WithProperties(prefix), '--svn-url', svnurl],
</span><span class="cx"> timeout=3600,
</span><span class="cx"> name="checkout",
</span><del>- description="checkout",
</del><ins>+ description=["syncing", "ports"],
+ descriptionDone=["sync", "ports"],
</ins><span class="cx"> haltOnFailure=True))
</span><span class="cx">
</span><span class="cx"> def extract_subportlist(rc, stdout, stderr):
</span><span class="lines">@@ -329,7 +330,7 @@
</span><span class="cx"> command=WithProperties('./mpbb/mpbb list-subports %(fullportlist)s'),
</span><span class="cx"> extract_fn=extract_subportlist,
</span><span class="cx"> name="subports",
</span><del>- description="subports"))
</del><ins>+ description=["listing", "subports"]))
</ins><span class="cx">
</span><span class="cx"> portwatcher_factory.addStep(TriggerWithPortlist(
</span><span class="cx"> schedulerNames=[triggerable],
</span><span class="lines">@@ -371,22 +372,22 @@
</span><span class="cx"> portbuilder_factory.addStep(Compile(
</span><span class="cx"> command=['./mpbb/mpbb', 'install-dependencies', '--prefix', WithProperties(prefix), '--port', WithProperties('%(portname)s')],
</span><span class="cx"> name="install-dependencies",
</span><del>- description="installing deps",
- descriptionDone="install deps",
</del><ins>+ description=["installing", "dependencies"],
+ descriptionDone=["install", "dependencies"],
</ins><span class="cx"> haltOnFailure=True))
</span><span class="cx">
</span><span class="cx"> portbuilder_factory.addStep(Compile(
</span><span class="cx"> command=['./mpbb/mpbb', 'install-port', '--prefix', WithProperties(prefix), '--port', WithProperties('%(portname)s')],
</span><span class="cx"> name="install-port",
</span><del>- description="installing port",
- descriptionDone="install port",
</del><ins>+ description=["installing", "port"],
+ descriptionDone=["install", "port"],
</ins><span class="cx"> haltOnFailure=True))
</span><span class="cx">
</span><span class="cx"> portbuilder_factory.addStep(ShellCommand(
</span><span class="cx"> command=['./mpbb/mpbb', 'gather-archives', '--prefix', WithProperties(prefix), '--port', WithProperties('%(portname)s'), '--archive-site', archivesite, '--staging-dir', ulpath],
</span><span class="cx"> name="gather-archives",
</span><del>- description="gathering archives",
- descriptionDone="gather archives",
</del><ins>+ description=["gathering", "archives"],
+ descriptionDone=["gather", "archives"],
</ins><span class="cx"> haltOnFailure=True))
</span><span class="cx">
</span><span class="cx"> # upload archives from build slave to master
</span><span class="lines">@@ -394,14 +395,6 @@
</span><span class="cx"> slavesrc=ulpath,
</span><span class="cx"> masterdest=WithProperties(ulpath_unique)))
</span><span class="cx">
</span><del>-portbuilder_factory.addStep(ShellCommand(
- command=['./mpbb/mpbb', 'cleanup', '--prefix', WithProperties(prefix), '--port', WithProperties('%(portname)s')],
- name="cleanup",
- description="cleaning up",
- descriptionDone="clean up",
- alwaysRun=True))
-
-
</del><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><span class="lines">@@ -414,11 +407,12 @@
</span><span class="cx"> 'DLPATH': dlpath}))
</span><span class="cx">
</span><span class="cx"> # TODO: do we want to upload the individual logs so maintainers can review them?
</span><del>-#ports_factory.addStep(ShellCommand(command="./cleanup_old.sh",
-# name="cleanup",
-# description="cleanup",
-# env={'PREFIX': WithProperties(prefix),
-# 'ULPATH': ulpath}))
</del><ins>+portbuilder_factory.addStep(ShellCommand(
+ command=['./mpbb/mpbb', 'cleanup', '--prefix', WithProperties(prefix), '--port', WithProperties('%(portname)s')],
+ name="cleanup",
+ description=["cleaning"],
+ descriptionDone=["clean"],
+ alwaysRun=True))
</ins><span class="cx">
</span><span class="cx"> # === BUILDER CONFIGURATION ===
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>