[pypy-commit] buildbot issue-1759: move numpy testing to a triggerable build, add win32 target as well

[mattip]

Author: mattip <matti.picus at gmail.com>
Branch: issue-1759
Changeset: r927:caa856444a44
Date: 2015-02-10 18:52 +0200
http://bitbucket.org/pypy/buildbot/changeset/caa856444a44/

Log:	move numpy testing to a triggerable build, add win32 target as well

diff --git a/bot2/pypybuildbot/builds.py b/bot2/pypybuildbot/builds.py
--- a/bot2/pypybuildbot/builds.py
+++ b/bot2/pypybuildbot/builds.py
@@ -326,14 +326,14 @@
                 workdir=workdir,
                 logEnviron=False))
 
-def update_git(platform, factory, repourl, workdir, use_branch,
-              force_branch=None):
+def update_git(platform, factory, repourl, workdir, branch='master'):
     factory.addStep(
             Git(
                 repourl=repourl,
                 mode='full',
                 method='fresh',
                 workdir=workdir,
+                branch=branch,
                 logEnviron=False))
 
 def setup_steps(platform, factory, workdir=None,
@@ -473,7 +473,8 @@
                  interpreter='pypy',
                  lib_python=False,
                  pypyjit=False,
-                 prefix=None
+                 prefix=None,
+                 trigger=None,
                  ):
         factory.BuildFactory.__init__(self)
         if prefix is not None:
@@ -502,6 +503,9 @@
                                 workdir='.',
                                 blocksize=100 * 1024))
 
+        if trigger: # if provided trigger schedulers that depend on this one
+            self.addStep(Trigger(schedulerNames=[trigger]))
+
         add_translated_tests(self, prefix, platform, app_tests, lib_python, pypyjit)
 
 
@@ -882,6 +886,13 @@
             ))
 
         self.addStep(ShellCmd(
+            description="report version",
+            command=['install/bin/pypy', '--version'],
+            workdir='./',
+            haltOnFailure=True,
+            ))
+
+        self.addStep(ShellCmd(
             description="install nose",
             command=['install/bin/pip', 'install','nose'],
             workdir='./',
@@ -890,9 +901,7 @@
 
         # obtain a pypy-compatible branch of numpy
         numpy_url = 'https://www.bitbucket.org/pypy/numpy'
-        numpy_pypy_branch = 'pypy-compat'
-        update_git(platform, self, numpy_url, 'numpy_src', use_branch=True,
-              force_branch=numpy_pypy_branch)
+        update_git(platform, self, numpy_url, 'numpy_src', branch='master')
 
         self.addStep(ShellCmd(
             description="install numpy",
diff --git a/bot2/pypybuildbot/master.py b/bot2/pypybuildbot/master.py
--- a/bot2/pypybuildbot/master.py
+++ b/bot2/pypybuildbot/master.py
@@ -1,6 +1,6 @@
 
 import os
-from buildbot.scheduler import Nightly
+from buildbot.scheduler import Nightly, Triggerable
 from buildbot.schedulers.forcesched import ForceScheduler
 from buildbot.schedulers.forcesched import ValidationError
 from buildbot.buildslave import BuildSlave
@@ -96,6 +96,7 @@
     pypyjit=True,
     app_tests=True,
     platform='linux64',
+    trigger='NUMPY64_scheduler',
     )
 
 pypyJITTranslatedTestFactoryIndiana = pypybuilds.Translated(
@@ -133,6 +134,7 @@
     lib_python=True,
     pypyjit=True,
     app_tests=True,
+    trigger='NUMPYWIN_scheduler',
     )
 
 pypyJITTranslatedTestFactoryFreeBSD = pypybuilds.Translated(
@@ -186,6 +188,7 @@
 JITBENCH64_NEW = 'jit-benchmark-linux-x86-64-single-run'
 CPYTHON_64 = "cpython-2-benchmark-x86-64"
 NUMPY_64 = "numpy-compatability-linux-x86-64"
+NUMPY_WIN = "numpy-compatability-win-x86-32"
 # buildbot builder
 PYPYBUILDBOT = 'pypy-buildbot'
 
@@ -216,8 +219,8 @@
             APPLVLLINUX64,             # on allegro64, uses 1 core
             # other platforms
             #MACOSX32,                 # on minime
-            JITWIN32,                  # on aurora, SalsaSalsa
-            WIN32,                     # on aurora, SalsaSalsa
+            JITWIN32,                  # on allegro_win32, SalsaSalsa
+            WIN32,                     # on allegro_win32, SalsaSalsa
             #JITFREEBSD764,            # on headless
             #JITFREEBSD864,            # on ananke
             JITFREEBSD964,             # on tavendo
@@ -227,14 +230,20 @@
             ], branch='default', hour=0, minute=0),
 
         Nightly("nightly-1-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)
             JITBENCH64_NEW,            # on speed64, uses 1 core (in part exclusively)
 
         ], branch=None, hour=1, minute=0),
 
+        Triggerable("NUMPY64_scheduler", [
+            NUMPY_64,                  # on tannit64, uses 1 core, takes about 15min.
+        ]),
+
+        Triggerable("NUMPYWIN_scheduler", [
+            NUMPY_WIN,                  # on allegro_win32, SalsaSalsa
+        ]),
+
         Nightly("nightly-2-00-py3k", [
             LINUX64,                   # on allegro64, uses all cores
             APPLVLLINUX64,             # on allegro64, uses 1 core
@@ -279,6 +288,7 @@
                         JITBENCH64,
                         JITBENCH64_NEW,
                         NUMPY_64,
+                        NUMPY_WIN,
             ] + ARM.builderNames, properties=[]),
     ] + ARM.schedulers,
 
@@ -463,7 +473,14 @@
                    'factory': pypyNumpyCompatability,
                    'category': 'numpy',
                    'locks': [TannitCPU.access('counting')],
-                   },
+                  },
+                  {'name': NUMPY_WIN,
+                   'slavenames': ["allegro_win32", "SalsaSalsa"],
+                   'builddir': NUMPY_WIN,
+                   'factory': pypyNumpyCompatability,
+                   "locks": [WinSlaveLock.access('counting')],
+                   'category': 'numpy',
+                  },
                   {'name': PYPYBUILDBOT,
                    'slavenames': ['cobra'],
                    'builddir': PYPYBUILDBOT,