Author: Matti Picus <[email protected]>
Branch:
Changeset: r1045:21cd87db82d9
Date: 2017-12-07 00:21 +0200
http://bitbucket.org/pypy/buildbot/changeset/21cd87db82d9/
Log: no need for non-JIT builds on ARM, schedule backend tests only for
RPython changes
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
@@ -1,5 +1,5 @@
from buildbot.scheduler import Nightly, Triggerable
-from pypybuildbot.util import load
+from pypybuildbot.util import load, isRPython
pypybuilds = load('pypybuildbot.builds')
ARMCrossLock = pypybuilds.ARMCrossLock
@@ -10,13 +10,13 @@
crosstranslationargs = ['--platform=arm', '--gcrootfinder=shadowstack']
crosstranslationjitargs = ['--jit-backend=arm']
# this one needs a larger timeout due to how it is run
-pypyJitBackendOnlyOwnTestFactoryARM = pypybuilds.Own(
+pypyJitBackendOnlyRPythonTestFactoryARM = pypybuilds.RPython(
cherrypick=':'.join(["jit/backend/arm",
"jit/backend/llsupport",
"jit/backend/test", # kill this one in case it is
too slow
]),
timeout=36000)
-pypyJitOnlyOwnTestFactoryARM = pypybuilds.Own(cherrypick="jit", timeout=2 *
3600)
+pypyJitOnlyRPythonTestFactoryARM = pypybuilds.RPython(cherrypick="jit",
timeout=2 * 3600)
pypyOwnTestFactoryARM = pypybuilds.Own(timeout=2 * 3600)
pypyRPythonTestFactoryARM = pypybuilds.RPython(timeout=2 * 3600)
@@ -146,13 +146,20 @@
BUILDJITLINUXARMHF_RASPBIAN, # on hhu-cross-raspbianhf, uses 1 core
BUILDJITLINUXARMHF_RARING, # on hhu-cross-raring-armhf, uses 1 core
- BUILDLINUXARM, # on hhu-cross-armel, uses 1 core
- BUILDLINUXARMHF_RASPBIAN, # on hhu-cross-raspbianhf, uses 1 core
+ #BUILDLINUXARM, # on hhu-cross-armel, uses 1 core
+ #BUILDLINUXARMHF_RASPBIAN, # on hhu-cross-raspbianhf, uses 1 core
+ ], branch=None, hour=0, minute=0,
+ ),
+
+ Nightly("nightly-arm-0-01", [
JITBACKENDONLYLINUXARMEL, # on hhu-imx.53
JITBACKENDONLYLINUXARMHF,
JITBACKENDONLYLINUXARMHF_v7, # on cubieboard-bob
- ], branch=None, hour=0, minute=0),
+ ], branch='default', hour=0, minute=0, onlyIfChanged=True,
+ fileIsImportant=isRPython,
+ change_filter=filter.ChangeFilter(branch='default'),
+ ),
Triggerable("APPLVLLINUXARM_scheduler", [
APPLVLLINUXARM, # triggered by BUILDLINUXARM, on
hhu-beagleboard
@@ -182,7 +189,7 @@
{"name": JITBACKENDONLYLINUXARMEL,
"slavenames": ['hhu-i.mx53'],
"builddir": JITBACKENDONLYLINUXARMEL,
- "factory": pypyJitBackendOnlyOwnTestFactoryARM,
+ "factory": pypyJitBackendOnlyRPythonTestFactoryARM,
"category": 'linux-armel',
"locks": [ARMBoardLock.access('counting')],
},
@@ -191,7 +198,7 @@
{"name": JITBACKENDONLYLINUXARMHF,
"slavenames": ['hhu-raspberry-pi', 'hhu-pypy-pi', 'hhu-pypy-pi2'],
"builddir": JITBACKENDONLYLINUXARMHF,
- "factory": pypyJitBackendOnlyOwnTestFactoryARM,
+ "factory": pypyJitBackendOnlyRPythonTestFactoryARM,
"category": 'linux-armhf',
"locks": [ARMBoardLock.access('counting')],
},
@@ -199,7 +206,7 @@
{"name": JITBACKENDONLYLINUXARMHF_v7,
"slavenames": ['cubieboard-bob'],
"builddir": JITBACKENDONLYLINUXARMHF_v7,
- "factory": pypyJitBackendOnlyOwnTestFactoryARM,
+ "factory": pypyJitBackendOnlyRPythonTestFactoryARM,
"category": 'linux-armhf',
"locks": [ARMBoardLock.access('counting')],
},
diff --git a/bot2/pypybuildbot/master.py b/bot2/pypybuildbot/master.py
--- a/bot2/pypybuildbot/master.py
+++ b/bot2/pypybuildbot/master.py
@@ -11,7 +11,7 @@
#from buildbot import manhole
from pypybuildbot.pypylist import PyPyList, NumpyStatusList
from pypybuildbot.ircbot import IRC # side effects
-from pypybuildbot.util import we_are_debugging
+from pypybuildbot.util import we_are_debugging, isRPython
from buildbot.changes import filter
from buildbot.changes.hgpoller import HgPoller
@@ -63,7 +63,7 @@
pypybuilds = load('pypybuildbot.builds')
-# all ARM buildbot configuration si in arm_master.py
+# all ARM buildbot configuration is in arm_master.py
ARM = load('pypybuildbot.arm_master')
TannitCPU = pypybuilds.TannitCPU
@@ -271,13 +271,6 @@
'hhu-pypy-pi2': {'max_builds': 1},
}
-def isRPython(change):
- for fname in change.files:
- if fname.startswith('rpython'):
- log.msg('fileIsImportant filter isRPython got "%s"' % fname)
- return True
- return False
-
BuildmasterConfig = {
'slavePortnum': slavePortnum,
diff --git a/bot2/pypybuildbot/util.py b/bot2/pypybuildbot/util.py
--- a/bot2/pypybuildbot/util.py
+++ b/bot2/pypybuildbot/util.py
@@ -17,3 +17,10 @@
if os.path.lexists(dst):
os.remove(dst)
os.symlink(src, dst)
+
+def isRPython(change):
+ for fname in change.files:
+ if fname.startswith('rpython'):
+ log.msg('fileIsImportant filter isRPython got "%s"' % fname)
+ return True
+ return False
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
