Author: Richard Plangger <planri...@gmail.com> Branch: Changeset: r986:928b30c7fc85 Date: 2016-02-10 13:59 +0100 http://bitbucket.org/pypy/buildbot/changeset/928b30c7fc85/
Log: merged default diff --git a/bot2/pypybuildbot/builds.py b/bot2/pypybuildbot/builds.py --- a/bot2/pypybuildbot/builds.py +++ b/bot2/pypybuildbot/builds.py @@ -809,14 +809,18 @@ '--upload-executable', 'pypy-c' + postfix, '--upload-project', 'PyPy', '--revision', WithProperties('%(got_revision)s'), - '--branch', WithProperties('%(branch)s'), + # HACK: branches are not uploaded any more, so that + # codespeed will display it, even if not "default" + #'--branch', WithProperties('%(branch)s'), '--upload-urls', 'http://speed.pypy.org/', '--upload-baseline', '--upload-baseline-executable', 'pypy-c-jit' + postfix, '--upload-baseline-project', 'PyPy', '--upload-baseline-revision', WithProperties('%(got_revision)s'), - '--upload-baseline-branch', WithProperties('%(branch)s'), + # HACK: branches are not uploaded any more, so that + # codespeed will display it, even if not "default" + #'--upload-baseline-branch', WithProperties('%(branch)s'), '--upload-baseline-urls', 'http://speed.pypy.org/', ], workdir='./benchmarks', diff --git a/bot2/pypybuildbot/master.py b/bot2/pypybuildbot/master.py --- a/bot2/pypybuildbot/master.py +++ b/bot2/pypybuildbot/master.py @@ -273,7 +273,6 @@ # benchmarks # linux tests LINUX32, # on tannit32, uses all cores - LINUX64, # on speed-old, uses all cores JITLINUX32, # on tannit32, uses 1 core JITLINUX64, # on speed-old, uses 1 core #APPLVLLINUX32, # on tannit32, uses 1 core @@ -297,6 +296,7 @@ ], branch='s390x-backend', hour=2, minute=0), Nightly("nightly-1-00", [ + LINUX64, # on speed-old, uses all cores JITBENCH, # on tannit32, uses 1 core (in part exclusively) JITBENCH64, # on tannit64, uses 1 core (in part exclusively) JITBENCH64_NEW, # on speed64, uses 1 core (in part exclusively) _______________________________________________ pypy-commit mailing list pypy-commit@python.org https://mail.python.org/mailman/listinfo/pypy-commit