read worker password from prepared file

diff --git a/master.cfg b/master.cfg
index 0ecfe3b12a271f28108b34b1a27731bb4facecdf..3835957631093e8456314c9f3bd13a009883d845 100644 (file)
--- a/master.cfg
+++ b/master.cfg
@@ -15,7 +15,10 @@ c = BuildmasterConfig = {}
 # The 'workers' list defines the set of recognized workers. Each element is
 # a Worker object, specifying a unique worker name and password.  The same
 # worker name and password must be configured on the worker.
-c['workers'] = [worker.Worker("example-worker", "pass")]
+workerpass = None
+with open("worker-carbon.pass") as f:
+    workerpass = f.readline()
+c['workers'] = [worker.Worker("carbon-worker", workerpass)]
 
 # 'protocols' contains information about protocols which master will use for
 # communicating with workers. You must define at least 'port' option that workers
@@ -66,7 +69,7 @@ factory.addStep(steps.ShellCommand(command=["trial", "hello"],
 c['builders'] = []
 c['builders'].append(
     util.BuilderConfig(name="runtests",
-      workernames=["example-worker"],
+      workernames=["carbon-worker"],
       factory=factory))
 
 ####### BUILDBOT SERVICES