Author: Matti Picus <matti.pi...@gmail.com>
Branch: add-header-to-nightly
Changeset: r875:ec3983861744
Date: 2013-11-04 19:33 +0200
http://bitbucket.org/pypy/buildbot/changeset/ec3983861744/
Log: revert buildbot.tac
diff --git a/slave/buildbot.tac b/slave/buildbot.tac
--- a/slave/buildbot.tac
+++ b/slave/buildbot.tac
@@ -1,44 +1,56 @@
+# -*- mode: python -*-
+from twisted.application import service
+try:
+ # 8.x
+ from buildslave.bot import BuildSlave
+except ImportError:
+ #7.x
+ from buildbot.slave.bot import BuildSlave
-import os
+# ---------------------------------------------------------------
+# manual editing of the automatically generated buildbot.tac
+#
+import os.path
+thisfile = os.path.join(os.getcwd(), __file__)
+basedir = os.path.abspath(os.path.dirname(thisfile))
+#
+# ---------------------------------------------------------------
-from twisted.application import service
-from buildslave.bot import BuildSlave
+def find_passwd(slavename):
+ masterdir = os.path.join(basedir, '..', 'master')
+ slaveinfo = os.path.join(masterdir, 'slaveinfo.py')
+ d = {}
+ try:
+ execfile(slaveinfo, d)
+ return d['passwords'][slavename]
+ except Exception, e:
+ print 'error when executing ../master/slaveinfo.py: %s' % repr(e)
+ print 'using default password for the slave'
+ return 'default_password'
+
-basedir = r'/home/matti/pypy_stuff/buildbot/slave'
-rotateLength = 10000000
-maxRotatedFiles = 10
+buildmaster_host = 'localhost'
+port = 10407
+slavename = 'localhost'
+passwd = find_passwd(slavename)
+keepalive = 600
+usepty = 0
+umask = None
+maxdelay = 300
+rotateLength = 1000000
+maxRotatedFiles = None
-# if this is a relocatable tac file, get the directory containing the TAC
-if basedir == '.':
- import os.path
- basedir = os.path.abspath(os.path.dirname(__file__))
-
-# note: this line is matched against to check that this is a buildslave
-# directory; do not edit it.
application = service.Application('buildslave')
-
try:
from twisted.python.logfile import LogFile
from twisted.python.log import ILogObserver, FileLogObserver
- logfile = LogFile.fromFullPath(os.path.join(basedir, "twistd.log"),
rotateLength=rotateLength,
+ logfile = LogFile.fromFullPath("twistd.log", rotateLength=rotateLength,
maxRotatedFiles=maxRotatedFiles)
application.setComponent(ILogObserver, FileLogObserver(logfile).emit)
except ImportError:
# probably not yet twisted 8.2.0 and beyond, can't set log yet
pass
-
-buildmaster_host = 'localhost'
-port = 10407
-slavename = 'localhost'
-passwd = 'stam'
-keepalive = 600
-usepty = 0
-umask = None
-maxdelay = 300
-allow_shutdown = None
-
s = BuildSlave(buildmaster_host, port, slavename, passwd, basedir,
- keepalive, usepty, umask=umask, maxdelay=maxdelay,
- allow_shutdown=allow_shutdown)
+ keepalive, usepty, umask=umask, maxdelay=maxdelay)
s.setServiceParent(application)
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
