Author: Matti Picus <[email protected]>
Branch:
Changeset: r1063:0bfbe41f7868
Date: 2018-04-15 09:05 +0300
http://bitbucket.org/pypy/buildbot/changeset/0bfbe41f7868/
Log: depricate building on tannit32
diff --git a/bot2/pypybuildbot/builds.py b/bot2/pypybuildbot/builds.py
--- a/bot2/pypybuildbot/builds.py
+++ b/bot2/pypybuildbot/builds.py
@@ -14,7 +14,7 @@
# buildbot supports SlaveLocks, which can be used to limit the amout of builds
# to be run on each slave in parallel. However, they assume that each
# buildslave is on a differen physical machine, which is not the case for
-# tannit32 and tannit64. As a result, we have to use a global lock, and
+# bencher4 and bencher4_32. As a result, we have to use a global lock, and
# manually tell each builder that uses tannit to acquire it.
#
# Look at the various "locks" session in master.py/BuildmasterConfig. For
diff --git a/bot2/pypybuildbot/master.py b/bot2/pypybuildbot/master.py
--- a/bot2/pypybuildbot/master.py
+++ b/bot2/pypybuildbot/master.py
@@ -290,12 +290,12 @@
# All the other linux tests run on bencher4.soft-dev.org.
Nightly("nightly-0-00", [
# linux tests
- LINUX32OWN, # on tannit32, uses all cores
+ LINUX32OWN, # on bencher4_32, uses all cores
LINUX64OWN, # on bencher4, uses all cores
WIN32OWN, # on allegro_win32, SalsaSalsa
- JITLINUX32, # on tannit32, uses 1 core
+ JITLINUX32, # on bencher4_32, uses 1 core
JITLINUX64, # on bencher4, uses 1 core
- #APPLVLLINUX32, # on tannit32, uses 1 core
+ #APPLVLLINUX32, # on bencher4_32, uses 1 core
#APPLVLLINUX64, # on bencher4, uses 1 core
# other platforms
#MACOSX32, # on minime
@@ -311,7 +311,7 @@
),
Nightly("nightly-0-01", [
- LINUX32RPYTHON, # on tannit32, uses all cores
+ LINUX32RPYTHON, # on bencher4_32, uses all cores
LINUX64RPYTHON, # on bencher4, uses all cores
WIN32RPYTHON, # on allegro_win32, SalsaSalsa
LINUX_S390XRPYTHON,
@@ -342,8 +342,8 @@
# branch="py3.5", hour=3, minute=0),
Nightly("nightly-3-00-py3.5", [
- LINUX32OWN, # on tannit32, uses all cores
- JITLINUX32, # on tannit32, uses 1 core
+ LINUX32OWN, # on bencher4_32, uses all cores
+ JITLINUX32, # on bencher4_32, uses 1 core
LINUX64OWN, # on bencher4, uses all cores
JITLINUX64, # on bencher4, uses 1 core
JITMACOSX64, # on xerxes
@@ -418,14 +418,14 @@
'builders': [
{"name": LINUX32OWN,
- "slavenames": ["tannit32", "bencher4_32"],
+ "slavenames": ["bencher4_32"],
"builddir": LINUX32OWN,
"factory": pypyOwnTestFactory,
"category": 'linux32',
"locks": [TannitCPU.access('counting')],
},
{"name": LINUX32RPYTHON,
- "slavenames": ["tannit32", "bencher4_32"],
+ "slavenames": ["bencher4_32"],
"builddir": LINUX32RPYTHON,
"factory": pypyRPythonTestFactory,
"category": 'linux32',
@@ -449,7 +449,7 @@
},
{"name": APPLVLLINUX32,
#"slavenames": ["allegro32"],
- "slavenames": ["tannit32", "bencher4_32"],
+ "slavenames": ["bencher4_32"],
"builddir": APPLVLLINUX32,
"factory": pypyTranslatedAppLevelTestFactory,
'category': 'linux32',
@@ -464,7 +464,7 @@
"locks": [Bencher4Lock.access('counting')],
},
{"name": LIBPYTHON_LINUX32,
- "slavenames": ["tannit32", "bencher4_32"],
+ "slavenames": ["bencher4_32"],
#"slavenames": ["allegro32"],
"builddir": LIBPYTHON_LINUX32,
"factory": pypyTranslatedLibPythonTestFactory,
@@ -481,7 +481,7 @@
},
{"name" : JITLINUX32,
#"slavenames": ["allegro32"],
- "slavenames": ["tannit32", "bencher4_32"],
+ "slavenames": ["bencher4_32"],
'builddir' : JITLINUX32,
'factory' : pypyJITTranslatedTestFactory,
'category' : 'linux32',
@@ -577,7 +577,6 @@
},
{'name': NUMPY_64,
'slavenames': ["bencher4"],
- #'slavenames': ["tannit64"],
'builddir': NUMPY_64,
'factory': pypyNumpyCompatability,
'category': 'numpy',
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
