Author: mattip <[email protected]>
Branch:
Changeset: r996:1397a6c49fbe
Date: 2016-03-21 09:47 +0200
http://bitbucket.org/pypy/buildbot/changeset/1397a6c49fbe/
Log: remove nightly applevel linux64, move nightly py3k to jit, add lock
for speed-old
diff --git a/bot2/pypybuildbot/builds.py b/bot2/pypybuildbot/builds.py
--- a/bot2/pypybuildbot/builds.py
+++ b/bot2/pypybuildbot/builds.py
@@ -21,10 +21,13 @@
# translations in parallel, but then the actual benchmarks are run in
# sequence.
-# there are 8 logical CPUs, but only 4 physical ones, and only enough memory
for ~3 translations
+# tannit has 8 logical CPUs, but only 4 physical ones, and memory for ~3
translations
TannitCPU = locks.MasterLock('tannit_cpu', maxCount=3)
SpeedPythonCPU = locks.MasterLock('speed_python_cpu', maxCount=24)
WinSlaveLock = locks.SlaveLock('win_cpu', maxCount=1)
+# speed-old has 24 cores, but memory for ~2 translations
+SpeedOldLock = locks.MasterLock('speed_old_lock', maxCount=2)
+
# The cross translation machine can accomodate 2 jobs at the same time
ARMCrossLock = locks.MasterLock('arm_cpu', maxCount=2)
diff --git a/bot2/pypybuildbot/master.py b/bot2/pypybuildbot/master.py
--- a/bot2/pypybuildbot/master.py
+++ b/bot2/pypybuildbot/master.py
@@ -50,6 +50,7 @@
TannitCPU = pypybuilds.TannitCPU
WinSlaveLock = pypybuilds.WinSlaveLock
+SpeedOldLock = pypybuilds.SpeedOldLock
pypyOwnTestFactory = pypybuilds.Own()
pypyOwnTestFactoryWin = pypybuilds.Own(platform="win32")
@@ -272,7 +273,7 @@
JITLINUX32, # on tannit32, uses 1 core
JITLINUX64, # on speed-old, uses 1 core
#APPLVLLINUX32, # on tannit32, uses 1 core
- APPLVLLINUX64, # on speed-old, uses 1 core
+ #APPLVLLINUX64, # on speed-old, uses 1 core
# other platforms
#MACOSX32, # on minime
JITWIN32, # on allegro_win32, SalsaSalsa
@@ -303,7 +304,7 @@
Nightly("nightly-3-00-py3k", [
LINUX64, # on speed-old, uses all cores
- APPLVLLINUX64, # on speed-old, uses 1 core
+ JITLINUX64, # on speed-old, uses 1 core
], branch="py3k", hour=3, minute=0),
# S390X vm (ibm-research)
@@ -378,7 +379,7 @@
"builddir": LINUX64,
"factory": pypyOwnTestFactory,
"category": 'linux64',
- #"locks": [TannitCPU.access('counting')],
+ "locks": [SpeedOldLock.access('counting')],
},
{"name": APPLVLLINUX32,
#"slavenames": ["allegro32"],
@@ -393,7 +394,7 @@
"builddir": APPLVLLINUX64,
"factory": pypyTranslatedAppLevelTestFactory64,
"category": "linux64",
- #"locks": [TannitCPU.access('counting')],
+ "locks": [SpeedOldLock.access('counting')],
},
{"name": LIBPYTHON_LINUX32,
"slavenames": ["tannit32"],
@@ -408,7 +409,7 @@
"builddir": LIBPYTHON_LINUX64,
"factory": pypyTranslatedLibPythonTestFactory,
"category": "linux64",
- #"locks": [TannitCPU.access('counting')],
+ "locks": [SpeedOldLock.access('counting')],
},
{"name" : JITLINUX32,
#"slavenames": ["allegro32"],
@@ -423,7 +424,7 @@
'builddir': JITLINUX64,
'factory': pypyJITTranslatedTestFactory64,
'category': 'linux64',
- #"locks": [TannitCPU.access('counting')],
+ "locks": [SpeedOldLock.access('counting')],
},
{"name": JITBENCH,
"slavenames": ["tannit32"],
@@ -444,6 +445,7 @@
"builddir": JITBENCH64_NEW,
"factory": pypyJITBenchmarkFactory64_speed,
"category": "benchmark-run",
+ "locks": [SpeedOldLock.access('exclusive')],
},
{"name": MACOSX32,
"slavenames": ["minime"],
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
