Author: Matti Picus <matti.pi...@gmail.com> Branch: Changeset: r1046:9c8b26858cfa Date: 2017-12-09 21:46 +0200 http://bitbucket.org/pypy/buildbot/changeset/9c8b26858cfa/
Log: kill raring build, activate py3.5 on ARM, add more onlyIfChanged 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,6 @@ from buildbot.scheduler import Nightly, Triggerable from pypybuildbot.util import load, isRPython +from buildbot.changes import filter pypybuilds = load('pypybuildbot.builds') ARMCrossLock = pypybuilds.ARMCrossLock @@ -51,15 +52,6 @@ prefix=['schroot', '-c', 'raspbian', '--'], trigger='JITLINUXARMHF_RASPBIAN_scheduler') -pypyJITCrossTranslationFactoryRaringHF = pypybuilds.NightlyBuild( - translationArgs=(crosstranslationargs - + jit_translation_args - + crosstranslationjitargs), - platform='linux-armhf-raring', - interpreter='pypy', - prefix=['schroot', '-c', 'raring', '--'], - trigger='JITLINUXARMHF_RARING_scheduler') - pypyARMJITTranslatedTestFactory = pypybuilds.TranslatedTests( translationArgs=(crosstranslationargs + jit_translation_args @@ -91,15 +83,7 @@ app_tests=True, platform='linux-armhf-raspbian', ) -pypyARMHF_RARING_JITTranslatedTestFactory = pypybuilds.TranslatedTests( - translationArgs=(crosstranslationargs - + jit_translation_args - + crosstranslationjitargs), - lib_python=True, - pypyjit=True, - app_tests=True, - platform='linux-armhf-raring', - ) + # LINUXARMHFOWN = "own-linux-armhf" LINUXARMHFRPYTHON = "rpython-linux-armhf" @@ -110,7 +94,6 @@ JITLINUXARM = "pypy-c-jit-linux-armel" JITLINUXARMHF_v7 = "pypy-c-jit-linux-armhf-v7" JITLINUXARMHF_RASPBIAN = "pypy-c-jit-linux-armhf-raspbian" -JITLINUXARMHF_RARING = "pypy-c-jit-linux-armhf-raring" JITBACKENDONLYLINUXARMEL = "jitbackendonly-own-linux-armel" JITBACKENDONLYLINUXARMHF = "jitbackendonly-own-linux-armhf" @@ -121,7 +104,6 @@ BUILDJITLINUXARM = "build-pypy-c-jit-linux-armel" BUILDLINUXARMHF_RASPBIAN = "build-pypy-c-linux-armhf-raspbian" BUILDJITLINUXARMHF_RASPBIAN = "build-pypy-c-jit-linux-armhf-raspbian" -BUILDJITLINUXARMHF_RARING = "build-pypy-c-jit-linux-armhf-raring" builderNames = [ APPLVLLINUXARM, @@ -137,19 +119,25 @@ BUILDJITLINUXARM, BUILDLINUXARMHF_RASPBIAN, BUILDJITLINUXARMHF_RASPBIAN, - BUILDJITLINUXARMHF_RARING, ] schedulers = [ Nightly("nighly-arm-0-00", [ BUILDJITLINUXARM, # on hhu-cross-armel, uses 1 core 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 - ], branch=None, hour=0, minute=0, + ], branch='default', hour=0, minute=0, + onlyIfChanged=True, + ), + + Nightly("nightly-arm-3-00-py3.5", [ + BUILDJITLINUXARM, # on hhu-cross-armel, uses 1 core + BUILDJITLINUXARMHF_RASPBIAN, # on hhu-cross-raspbianhf, uses 1 core + ], branch="py3.5", hour=3, minute=0, + onlyIfChanged=True, ), Nightly("nightly-arm-0-01", [ @@ -178,8 +166,6 @@ JITLINUXARMHF_v7, # triggered by BUILDJITLINUXARMHF_RASPBIAN, on cubieboard-bob ]), - Triggerable("JITLINUXARMHF_RARING_scheduler", [ # triggered by BUILDJITLINUXARMHF_RARING - ]) ] builders = [ @@ -285,11 +271,4 @@ "category": 'linux-armhf', "locks": [ARMCrossLock.access('counting')], }, - {"name": BUILDJITLINUXARMHF_RARING, - "slavenames": ['hhu-cross-raring'], - "builddir": BUILDJITLINUXARMHF_RARING, - "factory": pypyJITCrossTranslationFactoryRaringHF, - "category": 'linux-armhf', - "locks": [ARMCrossLock.access('counting')], - }, ] diff --git a/bot2/pypybuildbot/builds.py b/bot2/pypybuildbot/builds.py --- a/bot2/pypybuildbot/builds.py +++ b/bot2/pypybuildbot/builds.py @@ -728,14 +728,14 @@ # copy pypy-c to the expected location within the pypy source checkout command = ('PYPY_C="pypy-c/bin/pypy";' 'if [ -e pypy-c/bin/pypy3 ]; then PYPY_C="pypy-c/bin/pypy3"; fi;' - 'cp -v $PYPY_C build/pypy/goal/pypy-c;') + 'cp -v $PYPY_C build/pypy/goal;') self.addStep(ShellCmd( description="move pypy-c", command=command, haltOnFailure=True, workdir='.')) # copy libpypy-c.so to the expected location within the pypy source checkout, if available - command = 'if [ -e pypy-c/bin/libpypy-c.so ]; then cp -v pypy-c/bin/libpypy-c.so build/pypy/goal/; fi;' + command = 'if [ -e pypy-c/bin/libpypy-c.so ]; then cp -v pypy-c/bin/libpypy-c.so build/pypy/goal; fi;' self.addStep(ShellCmd( description="move libpypy-c.so", command=command, diff --git a/bot2/pypybuildbot/master.py b/bot2/pypybuildbot/master.py --- a/bot2/pypybuildbot/master.py +++ b/bot2/pypybuildbot/master.py @@ -300,7 +300,9 @@ JITMACOSX64, # on xerxes # buildbot selftest #PYPYBUILDBOT # on cobra - ], branch='default', hour=0, minute=0), + ], branch='default', hour=0, minute=0, + onlyIfChanged=True, + ), Nightly("nightly-0-01", [ LINUX32RPYTHON, # on tannit32, uses all cores @@ -317,7 +319,9 @@ JITBENCH64, # on tannit64, uses 1 core (in part exclusively) #JITBENCH64_NEW, # on speed64, uses 1 core (in part exclusively) - ], branch=None, hour=5, minute=0), + ], branch='default', hour=5, minute=0, + onlyIfChanged=True, + ), Triggerable("NUMPY64_scheduler", [ #NUMPY_64, # on tannit64, uses 1 core, takes about 5min. @@ -337,13 +341,17 @@ JITLINUX64, # on bencher4, uses 1 core JITMACOSX64, # on xerxes JITWIN32, # on allegro_win32, SalsaSalsa - ], branch="py3.5", hour=3, minute=0), + ], branch="py3.5", hour=3, minute=0, + onlyIfChanged=True, + ), # S390X vm (ibm-research) Nightly("nightly-4-00", [ LINUX_S390XOWN, ], branch='default', hour=0, minute=0), - Nightly("nightly-4-01", [JITLINUX_S390X], branch='default', hour=2, minute=0), + Nightly("nightly-4-01", [JITLINUX_S390X], branch='default', hour=2, minute=0, + onlyIfChanged=True, + ), # this one has faithfully run every night even though the latest # change to that branch was in January 2013. Re-enable one day. _______________________________________________ pypy-commit mailing list pypy-commit@python.org https://mail.python.org/mailman/listinfo/pypy-commit