[pypy-commit] buildbot default: add a lock for the qemu-arm builders

[bivab]

Author: David Schneider <david.schneider at picle.org>
Branch: 
Changeset: r674:2596ae18bcdc
Date: 2012-09-03 11:11 +0200
http://bitbucket.org/pypy/buildbot/changeset/2596ae18bcdc/

Log:	add a lock for the qemu-arm builders

diff --git a/bot2/pypybuildbot/builds.py b/bot2/pypybuildbot/builds.py
--- a/bot2/pypybuildbot/builds.py
+++ b/bot2/pypybuildbot/builds.py
@@ -20,6 +20,7 @@
 TannitCPU = locks.MasterLock('tannit_cpu', maxCount=6)
 SpeedPythonCPU = locks.MasterLock('speed_python_cpu', maxCount=24)
 WinLockCPU = locks.MasterLock('win_cpu', maxCount=1)
+ARMLockCPU = locks.MasterLock('arm_cpu', maxCount=2)
 
 
 class ShellCmd(shell.ShellCommand):
diff --git a/bot2/pypybuildbot/master.py b/bot2/pypybuildbot/master.py
--- a/bot2/pypybuildbot/master.py
+++ b/bot2/pypybuildbot/master.py
@@ -49,6 +49,7 @@
 pypybuilds = load('pypybuildbot.builds')
 TannitCPU = pypybuilds.TannitCPU
 WinLockCPU = pypybuilds.WinLockCPU
+ARMLockCPU = pypybuilds.WinLockCPU
 
 pypyOwnTestFactory = pypybuilds.Own()
 pypyOwnTestFactoryWin = pypybuilds.Own(platform="win32")
@@ -461,15 +462,19 @@
                    "builddir": LINUXARMEL,
                    "factory": pypyOwnTestFactoryARM,
                    "category": 'linux-armel',
+                   # this build needs 2 CPUs
+                   "locks": [ARMLockCPU.access('exclusive')],
                   },
                   {"name": JITONLYLINUXARMEL,
                    "slavenames": ['hhu-qemu-armel'],
                    "builddir": JITONLYLINUXARMEL,
                    "factory": pypyJitOnlyOwnTestFactoryARM,
                    "category": 'linux-armel',
+                   # this build needs 2 CPUs
+                   "locks": [ARMLockCPU.access('exclusive')],
                   },
                   {"name": JITBACKENDONLYLINUXARMEL,
-                   "slavenames": ['hhu-arm', 'hhu-qemu-armel'],
+                   "slavenames": ['hhu-arm'],
                    "builddir": JITBACKENDONLYLINUXARMEL,
                    "factory": pypyJitBackendOnlyOwnTestFactoryARM,
                    "category": 'linux-armel',