Author: Maciej Fijalkowski <[email protected]>
Branch:
Changeset: r706:552456ffa2ed
Date: 2012-10-10 10:52 +0200
http://bitbucket.org/pypy/buildbot/changeset/552456ffa2ed/
Log: reconfigure slaves and kill old unused target
diff --git a/bot2/pypybuildbot/master.py b/bot2/pypybuildbot/master.py
--- a/bot2/pypybuildbot/master.py
+++ b/bot2/pypybuildbot/master.py
@@ -231,7 +231,6 @@
JITWIN64 = "pypy-c-jit-win-x86-64"
JITFREEBSD64 = 'pypy-c-jit-freebsd-7-x86-64'
-JITONLYLINUX32 = "jitonly-own-linux-x86-32"
JITBACKENDONLYLINUXARMEL = "jitbackendonly-own-linux-armel"
JITBACKENDONLYLINUXARMELXDIST = "jitbackendonly-own-linux-armel-xdist"
JITONLYLINUXPPC64 = "jitonly-own-linux-ppc-64"
@@ -317,62 +316,48 @@
"locks": [TannitCPU.access('exclusive')],
},
{"name": LINUX64,
- "slavenames": ["tannit64"],
+ "slavenames": ["tannit64", "allegro64"],
"builddir": LINUX64,
"factory": pypyOwnTestFactory,
"category": 'linux64',
# this build needs 4 CPUs
"locks": [TannitCPU.access('exclusive')],
},
- {"name": LINUX64 + "2",
- "slavenames": ["allegro64"],
- "builddir": LINUX64 + "2",
- "factory": pypyOwnTestFactory,
- "category": 'linux64',
- # no locks, this is not a tannit build
- },
{"name": APPLVLLINUX32,
- "slavenames": ["bigdogvm1", "tannit32"],
+ "slavenames": ["tannit32", "allegro32"],
"builddir": APPLVLLINUX32,
"factory": pypyTranslatedAppLevelTestFactory,
'category': 'linux32',
"locks": [TannitCPU.access('counting')],
},
{"name": APPLVLLINUX64,
- "slavenames": ["tannit64"],
+ "slavenames": ["tannit64", "allegro64"],
"builddir": APPLVLLINUX64,
"factory": pypyTranslatedAppLevelTestFactory64,
"category": "linux64",
"locks": [TannitCPU.access('counting')],
},
{"name": OJITLINUX32,
- "slavenames": ["bigdogvm1", "tannit32"],
+ "slavenames": ["tannit32", "allegro32"],
"builddir": OJITLINUX32,
"factory": pypy_OjitTranslatedTestFactory,
"category": 'linux32',
"locks": [TannitCPU.access('counting')],
},
{"name" : JITLINUX32,
- "slavenames": ["bigdogvm1", "tannit32"],
+ "slavenames": ["tannit32", "allegro32"],
'builddir' : JITLINUX32,
'factory' : pypyJITTranslatedTestFactory,
'category' : 'linux32',
"locks": [TannitCPU.access('counting')],
},
{'name': JITLINUX64,
- 'slavenames': ['tannit64'],
+ 'slavenames': ['tannit64', "allegro64"],
'builddir': JITLINUX64,
'factory': pypyJITTranslatedTestFactory64,
'category': 'linux64',
"locks": [TannitCPU.access('counting')],
},
- {"name": JITONLYLINUX32,
- "slavenames": ["tannit32", "bigdogvm1"],
- "builddir": JITONLYLINUX32,
- "factory": pypyJitOnlyOwnTestFactory,
- "category": 'linux32',
- "locks": [TannitCPU.access('counting')],
- },
{"name": JITBENCH,
"slavenames": ["tannit32"],
"builddir": JITBENCH,
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
