[pypy-commit] buildbot default: tweak layout, add nightly benchmark runs, try to enable py3.6 run only on changes

[mattip]

Author: Matti Picus <matti.picus at gmail.com>
Branch: 
Changeset: r1082:d9f4120168a1
Date: 2019-04-19 15:25 +0300
http://bitbucket.org/pypy/buildbot/changeset/d9f4120168a1/

Log:	tweak layout, add nightly benchmark runs, try to enable py3.6 run
	only on changes

diff --git a/bot2/pypybuildbot/master.py b/bot2/pypybuildbot/master.py
--- a/bot2/pypybuildbot/master.py
+++ b/bot2/pypybuildbot/master.py
@@ -323,10 +323,10 @@
         ),
 
         Nightly("nightly-1-00", [
-            #JITBENCH64,                # on benchmarker, uses 1 core (in part exclusively)
+            JITBENCH64,                # on benchmarker, uses 1 core (in part exclusively)
             #JITBENCH64_NEW,            # on speed64, uses 1 core (in part exclusively)
 
-            ], branch=None, hour=5, minute=0,
+            ], branch=None, hour=7, minute=0,
             # XXX causes hg updatee -r nnn from pypy/pypy instead of pypy/benchmarks
             #onlyIfChanged=True,
         ),
@@ -342,7 +342,7 @@
         #Nightly("nightly-3-01-py3.5", [LINUX64, JITLINUX64,],
         #        branch="py3.5", hour=3, minute=0),
 
-        Nightly("nightly-3-00-py3.5", [
+        Nightly("nightly-3-00-py3.6", [
             LINUX32OWN,                # on bencher4_32, uses all cores
             JITLINUX32,                # on bencher4_32, uses 1 core
             LINUX64OWN,                # on bencher4, uses all cores
@@ -350,7 +350,7 @@
             JITMACOSX64,               # on xerxes
             JITWIN32,                  # on SalsaSalsa
             ], branch="py3.6", hour=3, minute=0,
-            #onlyIfChanged=True,
+            onlyIfChanged=True,
         ),
 
         # this one has faithfully run every night even though the latest
diff --git a/bot2/pypybuildbot/pypylist.py b/bot2/pypybuildbot/pypylist.py
--- a/bot2/pypybuildbot/pypylist.py
+++ b/bot2/pypybuildbot/pypylist.py
@@ -28,8 +28,8 @@
         'linux':    100,
         'linux64':   50,
         'osx':       30,
-        's390x':     20,
-        'win32':     10,
+        'win32':     20,
+        's390x':     10,
         'linux_armhf_raspbian': 7,
         'linux_armhf_raring': 6,
         'linux_armel': 5,
diff --git a/master/templates/layout.html b/master/templates/layout.html
--- a/master/templates/layout.html
+++ b/master/templates/layout.html
@@ -27,7 +27,6 @@
         - <a href="http://speed.pypy.org/">Speed</a>
         - <!-- a href="{{ path_to_root }}numpy-status/">NumPy compatibility</a -->
         - <a href="{{ path_to_root }}summary?branch=<trunk>">Summary (trunk)</a>
-        - <a href="{{ path_to_root }}summary?branch=py3.5">Summary (py3.5)</a>
         - <a href="{{ path_to_root }}summary?branch=py3.6">Summary (py3.6)</a>
         - <a href="{{ path_to_root }}summary">Summary</a>
         - <a href="{{ path_to_root }}summary?builder=rpython-linux-x86-32&builder=rpython-linux-x86-64&builder=rpython-win-x86-32">RPython</a>