Author: Antonio Cuni <[email protected]>
Branch:
Changeset: r580:df4fb8719e7d
Date: 2011-08-09 10:15 +0200
http://bitbucket.org/pypy/buildbot/changeset/df4fb8719e7d/
Log: sigh, if we use the "proper" locks buildbot goes in a deadlock. The
workaround is to take an exclusive lock for own-linux* builds: it
uses 4 cores on tannit which is the number of physical CPUs anyway
diff --git a/bot2/pypybuildbot/master.py b/bot2/pypybuildbot/master.py
--- a/bot2/pypybuildbot/master.py
+++ b/bot2/pypybuildbot/master.py
@@ -1,3 +1,4 @@
+import getpass
from buildbot.scheduler import Nightly
from buildbot.buildslave import BuildSlave
from buildbot.status.html import WebStatus
@@ -16,11 +17,15 @@
StatusResourceBuilder.force = my_force
# Done
+if getpass.getuser() == 'antocuni':
+ channel = '#buildbot-test'
+else:
+ channel = '#pypy'
status = WebStatus(httpPortNumber, allowForce=True)
ircbot = IRC(host="irc.freenode.org",
nick="bbot2",
- channels=["#pypy"],
+ channels=[channel],
notify_events={
'started': 1,
'finished': 1,
@@ -219,11 +224,7 @@
"factory": pypyOwnTestFactory,
"category": 'linux32',
# this build needs 4 CPUs
- "locks": [TannitCPU.access('counting'),
- TannitCPU.access('counting'),
- TannitCPU.access('counting'),
- TannitCPU.access('counting'),
- ],
+ "locks": [TannitCPU.access('exclusive')],
},
{"name": LINUX64,
"slavenames": ["tannit64"],
@@ -231,11 +232,7 @@
"factory": pypyOwnTestFactory,
"category": 'linux64',
# this build needs 4 CPUs
- "locks": [TannitCPU.access('counting'),
- TannitCPU.access('counting'),
- TannitCPU.access('counting'),
- TannitCPU.access('counting'),
- ],
+ "locks": [TannitCPU.access('exclusive')],
},
{"name": APPLVLLINUX32,
"slavenames": ["bigdogvm1", "tannit32"],
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
