[80190] contrib/buildbot/master.cfg

wsiegrist at apple.com wsiegrist at apple.com
Wed Jul 6 08:35:47 PDT 2011


Revision: 80190
          http://trac.macports.org/changeset/80190
Author:   wsiegrist at apple.com
Date:     2011-07-06 08:35:46 -0700 (Wed, 06 Jul 2011)
Log Message:
-----------
Use out of band files for sensitive password storage. Update settings for running on the real server.

Modified Paths:
--------------
    contrib/buildbot/master.cfg

Modified: contrib/buildbot/master.cfg
===================================================================
--- contrib/buildbot/master.cfg	2011-07-06 15:27:00 UTC (rev 80189)
+++ contrib/buildbot/master.cfg	2011-07-06 15:35:46 UTC (rev 80190)
@@ -1,6 +1,8 @@
 # -*- python -*-
 # ex: set syntax=python:
 
+import json
+
 # This is a buildmaster config file. It must be installed as
 # 'master.cfg' in your buildmaster's base directory.
 
@@ -11,7 +13,7 @@
 # Master variable to toggle config between testing on your personal system
 # (where /opt/local shouldn't be messed with) and the production server (where
 # it has to be)
-production = False
+production = True
 
 ####### BUILDSLAVES
 
@@ -19,16 +21,20 @@
 # a BuildSlave object, specifying a unique slave name and password.  The same
 # slave name and password must be configured on the slave.
 from buildbot.buildslave import BuildSlave
+
+c['slaves'] = []
 if production:
-    # FIXME
-    c['slaves'] = []
+    slavedata = json.load(open('slaves.json'))
+    for slave, pwd in slavedata.items():
+        c['slaves'].append(BuildSlave(slave, pwd))
 else:
     c['slaves'] = [BuildSlave("snowleopard-x86_64", "pass")]
 
+
 # 'slavePortnum' defines the TCP port to listen on for connections from slaves.
 # This must match the value configured into the buildslaves (with their
 # --master option)
-c['slavePortnum'] = 9989
+c['slavePortnum'] = 17000
 
 ####### CHANGESOURCES
 
@@ -40,8 +46,8 @@
 
 if production:
     from buildbot.changes.pb import PBChangeSource
-    # FIXME: real username and password
-    c['change_source'] = PBChangeSource(user='change', passwd='changepw')
+    sourcedata = json.load(open('source.json'))
+    c['change_source'] = PBChangeSource(user=sourcedata[0], passwd=sourcedata[1])
 else:
     from buildbot.changes.svnpoller import SVNPoller
     c['change_source'] = [SVNPoller(
@@ -161,18 +167,19 @@
 from buildbot.config import BuilderConfig
 
 if production:
-    # FIXME
-    c['builders']= []
+    slavenames = ["apple-snowleopard-x86_64"]
 else:
-    c['builders']= [
-        BuilderConfig(name="buildbase",
-          slavenames=["snowleopard-x86_64"],
-          factory=base_factory),
-        BuilderConfig(name="buildports",
-          slavenames=["snowleopard-x86_64"],
-          factory=ports_factory)
-        ]
+    slavenames = ["snowleopard-x86_64"]
 
+c['builders']= [
+    BuilderConfig(name="buildbase",
+                  slavenames=slavenames,
+                  factory=base_factory),
+    BuilderConfig(name="buildports",
+                  slavenames=slavenames,
+                  factory=ports_factory)
+    ]
+
 ####### STATUS TARGETS
 
 # 'status' is a list of Status Targets. The results of each build will be
@@ -190,11 +197,11 @@
     forceBuild = True, # use this to test your slave once it is set up
     forceAllBuilds = False,
     pingBuilder = False,
-    stopBuild = False,
+    stopBuild = True,
     stopAllBuilds = False,
     cancelPendingBuild = False,
 )
-c['status'].append(html.WebStatus(http_port=8010, authz=authz_cfg))
+c['status'].append(html.WebStatus(http_port=80, authz=authz_cfg))
 
 ####### PROJECT IDENTITY
 
@@ -211,7 +218,7 @@
 # with an externally-visible host name which the buildbot cannot figure out
 # without some help.
 
-c['buildbotURL'] = "http://localhost:8010/"
+c['buildbotURL'] = "http://build.macports.org/"
 
 ####### DB URL
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110706/5004fdc1/attachment.html>


More information about the macports-changes mailing list