Changeset 80190

Timestamp:

07/06/11 08:35:46 (4 years ago)

Author:

wsiegrist@…

Message:

Use out of band files for sensitive password storage. Update settings for running on the real server.

File:

• contrib/buildbot/master.cfg (modified) (7 diffs)

contrib/buildbot/master.cfg

@@ -1 +1 @@
 # -*- python -*-
 # ex: set syntax=python:
+
+import json
 
 # This is a buildmaster config file. It must be installed as
@@ -12 +14 @@
 # (where /opt/local shouldn't be messed with) and the production server (where
 # it has to be)
-production = False
+production = True
 
 ####### BUILDSLAVES
@@ -20 +22 @@
 # slave name and password must be configured on the slave.
 from buildbot.buildslave import BuildSlave
-if production:
-    # FIXME
-    c['slaves'] = []
+
+c['slaves'] = []
+if production:
+    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
@@ -41 +47 @@
 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
@@ -162 +168 @@
 
 if production:
-    # FIXME
-    c['builders']= []
-else:
-    c['builders']= [
-        BuilderConfig(name="buildbase",
-          slavenames=["snowleopard-x86_64"],
-          factory=base_factory),
-        BuilderConfig(name="buildports",
-          slavenames=["snowleopard-x86_64"],
-          factory=ports_factory)
-        ]
+    slavenames = ["apple-snowleopard-x86_64"]
+else:
+    slavenames = ["snowleopard-x86_64"]
+
+c['builders']= [
+    BuilderConfig(name="buildbase",
+                  slavenames=slavenames,
+                  factory=base_factory),
+    BuilderConfig(name="buildports",
+                  slavenames=slavenames,
+                  factory=ports_factory)
+    ]
 
 ####### STATUS TARGETS
@@ -191 +198 @@
     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
@@ -212 +219 @@
 # without some help.
 
-c['buildbotURL'] = "http://localhost:8010/"
+c['buildbotURL'] = "http://build.macports.org/"
 
 ####### DB URL