[pypy-commit] buildbot default: kill the ARM xdist based builder

[bivab]

Author: David Schneider <david.schneider at picle.org>
Branch: 
Changeset: r766:f83a18b2639d
Date: 2013-04-06 12:12 +0200
http://bitbucket.org/pypy/buildbot/changeset/f83a18b2639d/

Log:	kill the ARM xdist based builder

diff --git a/bot2/pypybuildbot/builds.py b/bot2/pypybuildbot/builds.py
--- a/bot2/pypybuildbot/builds.py
+++ b/bot2/pypybuildbot/builds.py
@@ -26,9 +26,6 @@
 ARMCrossLock = locks.SlaveLock('arm_cpu', maxCount=2)
 # while the boards can only run one job at the same time
 ARMBoardLock = locks.SlaveLock('arm_boards', maxCount=1)
-# and the builder using xdist uses both boards and needs exclusive access to this lock
-ARMXdistLock = locks.MasterLock('arm_xdist', maxCount=2)
-
 
 
 # XXX monkey patch Trigger class, there are to issues with the list of renderables
diff --git a/bot2/pypybuildbot/master.py b/bot2/pypybuildbot/master.py
--- a/bot2/pypybuildbot/master.py
+++ b/bot2/pypybuildbot/master.py
@@ -51,7 +51,6 @@
 #WinLockCPU = pypybuilds.WinLockCPU
 ARMCrossLock = pypybuilds.ARMCrossLock
 ARMBoardLock = pypybuilds.ARMBoardLock
-ARMXdistLock = pypybuilds.ARMXdistLock
 
 pypyOwnTestFactory = pypybuilds.Own()
 pypyOwnTestFactoryWin = pypybuilds.Own(platform="win32")
@@ -257,7 +256,6 @@
 JITINDIANA32 = "pypy-c-jit-indiana-x86-32"
 
 JITBACKENDONLYLINUXARMEL = "jitbackendonly-own-linux-armel"
-JITBACKENDONLYLINUXARMELXDIST = "jitbackendonly-own-linux-armel-xdist"
 JITONLYLINUXPPC64 = "jitonly-own-linux-ppc-64"
 JITBENCH = "jit-benchmark-linux-x86-32"
 JITBENCH64 = "jit-benchmark-linux-x86-64"
@@ -515,19 +513,13 @@
                    },
                   # ARM
                   # armel
-                  {"name": JITBACKENDONLYLINUXARMELXDIST,
-                   "slavenames": ['hhu-arm'],
-                   "builddir": JITBACKENDONLYLINUXARMELXDIST ,
-                   "factory": pypyJitBackendOnlyOwnTestFactoryARM,
-                   "category": 'linux-armel',
-                   "locks": [ARMXdistLock.access('exclusive'), ARMBoardLock.access('counting')],
-                   },
                   {"name": JITBACKENDONLYLINUXARMEL,
                    "slavenames": ['hhu-i.mx53'],
                    "builddir": JITBACKENDONLYLINUXARMEL,
                    "factory": pypyJitBackendOnlyOwnTestFactoryARM,
                    "category": 'linux-armel',
-                   "locks": [ARMXdistLock.access('counting'), ARMBoardLock.access('counting')],
+                   "locks": [ARMBoardLock.access('counting')],
+                   },
                    },
                   # app level builders
                   {"name": APPLVLLINUXARM,
@@ -535,14 +527,14 @@
                    "builddir": APPLVLLINUXARM,
                    "factory": pypyARMTranslatedAppLevelTestFactory,
                    "category": "linux-armel",
-                   "locks": [ARMXdistLock.access('counting'), ARMBoardLock.access('counting')],
+                   "locks": [ARMBoardLock.access('counting')],
                    },
                   {"name": JITLINUXARM,
                    "slavenames": ["hhu-beagleboard"],
                    'builddir': JITLINUXARM,
                    'factory': pypyARMJITTranslatedTestFactory ,
                    'category': 'linux-armel',
-                   "locks": [ARMXdistLock.access('counting'), ARMBoardLock.access('counting')],
+                   "locks": [ARMBoardLock.access('counting')],
                    },
                   # Translation Builders for ARM
                   {"name": BUILDLINUXARM,