Author: Matti Picus <[email protected]>
Branch: add-header-to-nightly
Changeset: r896:d69069fecc21
Date: 2013-11-17 23:54 +0200
http://bitbucket.org/pypy/buildbot/changeset/d69069fecc21/
Log: merge default into branch
diff --git a/bot2/pypybuildbot/arm_master.py b/bot2/pypybuildbot/arm_master.py
--- a/bot2/pypybuildbot/arm_master.py
+++ b/bot2/pypybuildbot/arm_master.py
@@ -136,6 +136,7 @@
BUILDJITLINUXARM,
BUILDLINUXARMHF_RASPBIAN,
BUILDJITLINUXARMHF_RASPBIAN,
+ BUILDJITLINUXARMHF_RARING,
]
schedulers = [
diff --git a/bot2/pypybuildbot/builds.py b/bot2/pypybuildbot/builds.py
--- a/bot2/pypybuildbot/builds.py
+++ b/bot2/pypybuildbot/builds.py
@@ -857,6 +857,11 @@
#env={"PYTHONPATH": ['download']}, # shouldn't be needed, but what
if it is set externally?
))
if host == 'tannit':
+ self.addStep(ShellCmd(
+ description="install jinja2",
+ command=['install/bin/pip', 'install', 'jinja2'],
+ workdir='./',
+ haltOnFailure=True,))
pypy_c_rel = 'install/bin/python'
self.addStep(ShellCmd(
description="measure numpy compatibility",
diff --git a/bot2/pypybuildbot/master.py b/bot2/pypybuildbot/master.py
--- a/bot2/pypybuildbot/master.py
+++ b/bot2/pypybuildbot/master.py
@@ -214,18 +214,21 @@
# other platforms
#MACOSX32, # on minime
JITWIN32, # on aurora
- JITFREEBSD764, # on headless
- JITFREEBSD864, # on ananke
- JITFREEBSD964, # on exarkun's freebsd
+ #JITFREEBSD764, # on headless
+ #JITFREEBSD864, # on ananke
+ JITFREEBSD964, # on tavendo
JITMACOSX64, # on xerxes
# buildbot selftest
PYPYBUILDBOT # on cobra
], branch='default', hour=0, minute=0),
Nightly("nightly-2-00", [
+ NUMPY_64, # on tannit64, uses 1 core, takes about
15min.
+ # XXX maybe use a trigger instead?
JITBENCH, # on tannit32, uses 1 core (in part
exclusively)
JITBENCH64, # on tannit64, uses 1 core (in part
exclusively)
- ], branch='default', hour=2, minute=0),
+
+ ], branch=None, hour=2, minute=0),
Nightly("nightly-2-00-py3k", [
LINUX64, # on allegro64, uses all cores
@@ -235,6 +238,7 @@
Nightly("nighly-ppc", [
JITONLYLINUXPPC64, # on gcc1
], branch='ppc-jit-backend', hour=1, minute=0),
+
CustomForceScheduler('Force Scheduler',
builderNames=[
PYPYBUILDBOT,
@@ -411,7 +415,7 @@
"category": 'freebsd64'
},
{"name" : JITFREEBSD964,
- "slavenames": ['hybridlogic'],
+ "slavenames": ['hybridlogic', 'tavendo-freebsd-9.2-amd64'],
'builddir' : JITFREEBSD964,
'factory' : pypyJITTranslatedTestFactoryFreeBSD,
"category": 'freebsd64'
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
