<!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>[152491] 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/152491">152491</a></dd>
<dt>Author</dt> <dd>raimue@macports.org</dd>
<dt>Date</dt> <dd>2016-09-11 06:32:09 -0700 (Sun, 11 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>buildbot: explicit use config.json variables</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 (152490 => 152491)</h4>
<pre class="diff"><span>
<span class="info">--- contrib/buildbot-test/master.cfg 2016-09-11 12:34:55 UTC (rev 152490)
+++ contrib/buildbot-test/master.cfg 2016-09-11 13:32:09 UTC (rev 152491)
</span><span class="lines">@@ -20,28 +20,29 @@
</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/"
-htpasswdfile = "htpasswd"
-mpbbsvnurl = "https://svn.macports.org/repository/macports/contrib/mp-buildbot"
-svnurl = "https://svn.macports.org/repository/macports/trunk"
-archivesite = "https://packages.macports.org"
-slaveprefix = "/opt/local"
-toolsprefix = "/opt/mports"
</del><ins>+config = {
+ 'production': False,
+ 'privkey': "",
+ 'slaveport': 9989,
+ 'httpport': 8010,
+ 'buildboturl': "http://localhost:8010/",
+ 'htpasswdfile': "htpasswd",
+ 'mpbbsvnurl': "https://svn.macports.org/repository/macports/contrib/mp-buildbot",
+ 'svnurl': "https://svn.macports.org/repository/macports/trunk",
+ 'archivesite': "https://packages.macports.org",
+ 'slaveprefix': "/opt/local",
+ 'toolsprefix': "/opt/mports"
+}
</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", "svnurl", "archivesite", "slaveprefix", "toolsprefix"]:
</del><ins>+ for key in config:
</ins><span class="cx"> if configdata[key]:
</span><del>- locals[key] = configdata[key]
</del><ins>+ config[key] = configdata[key]
</ins><span class="cx">
</span><span class="cx"> path_base = "/usr/bin:/bin:/usr/sbin:/sbin"
</span><del>-path_ports = os.path.join(toolsprefix, "bin") + ":" + path_base
</del><ins>+path_ports = os.path.join(config['toolsprefix'], "bin") + ":" + path_base
</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">@@ -72,7 +73,7 @@
</span><span class="cx"> # 'slavePortnum' defines the TCP port to listen on for connections from slaves.
</span><span class="cx"> # This must match the value configured into the buildslaves (with their
</span><span class="cx"> # --master option)
</span><del>-c['slavePortnum'] = slaveport
</del><ins>+c['slavePortnum'] = config['slaveport']
</ins><span class="cx">
</span><span class="cx"> ####### CHANGESOURCES
</span><span class="cx">
</span><span class="lines">@@ -82,7 +83,7 @@
</span><span class="cx"> # poller is used for local testing but PBChangeSource (which relies on
</span><span class="cx"> # notifications from a post-commit script) should be used in production
</span><span class="cx">
</span><del>-if production:
</del><ins>+if config['production']:
</ins><span class="cx"> # TODO
</span><span class="cx"> from buildbot.changes.pb import PBChangeSource
</span><span class="cx"> sourcedata = []
</span><span class="lines">@@ -244,12 +245,12 @@
</span><span class="cx">
</span><span class="cx"> # can't run with prefix inside the workdir in production,
</span><span class="cx"> # because archives must be built with prefix=/opt/local
</span><del>-if production:
</del><ins>+if config['production']:
</ins><span class="cx"> prefix='/opt/local'
</span><span class="cx"> dlhost='packages@packages-origin.macports.org'
</span><span class="cx"> dlpath='/var/www/html/packages'
</span><span class="cx"> else:
</span><del>- prefix=slaveprefix
</del><ins>+ prefix=config['slaveprefix']
</ins><span class="cx"> dlhost=''
</span><span class="cx"> dlpath='./deployed_archives'
</span><span class="cx">
</span><span class="lines">@@ -291,7 +292,7 @@
</span><span class="cx">
</span><span class="cx"> # get mp-buildbot; we'll do the checkout of base and dports via these scripts
</span><span class="cx"> portwatcher_factory.addStep(SVN(
</span><del>- repourl=mpbbsvnurl,
</del><ins>+ repourl=config['mpbbsvnurl'],
</ins><span class="cx"> env={"PATH": path_ports},
</span><span class="cx"> alwaysUseLatest=True,
</span><span class="cx"> preferLastChangedRev=True,
</span><span class="lines">@@ -313,7 +314,7 @@
</span><span class="cx"> haltOnFailure=True))
</span><span class="cx">
</span><span class="cx"> portwatcher_factory.addStep(ShellCommand(
</span><del>- command=['./mpbb/mpbb', 'checkout', '--prefix', WithProperties(prefix), '--svn-url', svnurl],
</del><ins>+ command=['./mpbb/mpbb', 'checkout', '--prefix', WithProperties(prefix), '--svn-url', config['svnurl']],
</ins><span class="cx"> timeout=3600,
</span><span class="cx"> name="checkout",
</span><span class="cx"> description=["syncing", "ports"],
</span><span class="lines">@@ -402,7 +403,7 @@
</span><span class="cx"> haltOnFailure=True))
</span><span class="cx">
</span><span class="cx"> portbuilder_factory.addStep(ShellCommand(
</span><del>- command=['./mpbb/mpbb', 'gather-archives', '--prefix', WithProperties(prefix), '--archive-site', archivesite, '--staging-dir', ulpath],
</del><ins>+ command=['./mpbb/mpbb', 'gather-archives', '--prefix', WithProperties(prefix), '--archive-site', config['archivesite'], '--staging-dir', ulpath],
</ins><span class="cx"> name="gather-archives",
</span><span class="cx"> description=["gathering", "archives"],
</span><span class="cx"> descriptionDone=["gather", "archives"],
</span><span class="lines">@@ -415,12 +416,12 @@
</span><span class="cx">
</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><del>-if production:
</del><ins>+if config['production']:
</ins><span class="cx"> portbuilder_factory.addStep(MasterShellCommand(command=["./deploy_archives.sh", WithProperties(ulpath_unique)],
</span><span class="cx"> name="deploy-archives",
</span><span class="cx"> description=["deploying", "archives"],
</span><span class="cx"> descriptionDone=["deploy", "archives"],
</span><del>- env={'PRIVKEY': privkey,
</del><ins>+ env={'PRIVKEY': config['privkey'],
</ins><span class="cx"> 'DLHOST': dlhost,
</span><span class="cx"> 'DLPATH': dlpath}))
</span><span class="cx">
</span><span class="lines">@@ -487,7 +488,7 @@
</span><span class="cx">
</span><span class="cx"> # add new users with crypt, not md5/sha1:
</span><span class="cx"> # htpasswd -d -n $USER
</span><del>-htauth = HTPasswdAuth(htpasswdfile)
</del><ins>+htauth = HTPasswdAuth(config['htpasswdfile'])
</ins><span class="cx">
</span><span class="cx"> authz_cfg=authz.Authz(
</span><span class="cx"> auth = htauth,
</span><span class="lines">@@ -649,7 +650,7 @@
</span><span class="cx"> 'subject' : subject
</span><span class="cx"> }
</span><span class="cx">
</span><del>-if production:
</del><ins>+if config['production']:
</ins><span class="cx"> # send mail about base failures to users on the blamelist
</span><span class="cx"> mn = MailNotifier(
</span><span class="cx"> fromaddr="noreply@macports.org",
</span><span class="lines">@@ -695,9 +696,9 @@
</span><span class="cx"> c['title'] = "MacPorts"
</span><span class="cx"> c['titleURL'] = "https://www.macports.org/"
</span><span class="cx">
</span><del>-c['buildbotURL'] = buildboturl
</del><ins>+c['buildbotURL'] = config['buildboturl']
</ins><span class="cx"> c['status'].append(html.WebStatus(
</span><del>- http_port=httpport,
</del><ins>+ http_port=config['httpport'],
</ins><span class="cx"> authz=authz_cfg,
</span><span class="cx"> changecommentlink=(r"#(\d+)", r"https://trac.macports.org/ticket/\1", r"Ticket \g<0>")
</span><span class="cx"> ))
</span></span></pre>
</div>
</div>
</body>
</html>