Author: David Schneider <david.schnei...@picle.org>
Branch: buildbot-0.8.7
Changeset: r825:41d58f6cac9e
Date: 2013-06-15 13:07 +0200
http://bitbucket.org/pypy/buildbot/changeset/41d58f6cac9e/
Log: merge default
diff --git a/bbhook/hook.py b/bbhook/hook.py
--- a/bbhook/hook.py
+++ b/bbhook/hook.py
@@ -3,6 +3,8 @@
import subprocess
import sys
import time
+import thread, Queue
+import traceback
from .main import app
from . import scm
@@ -39,7 +41,24 @@
yield commit
-def handle(payload, test=False):
+
+def _handle_thread():
+ while True:
+ local_repo = payload = None
+ try:
+ local_repo, payload = queue.get()
+ _do_handle(local_repo, payload)
+ except:
+ traceback.print_exc()
+ print >> sys.stderr, 'payload:'
+ pprint.pprint(payload, sys.stderr)
+ print >> sys.stderr
+
+queue = Queue.Queue()
+thread.start_new_thread(_handle_thread, ())
+
+
+def handle(payload, test=True):
path = payload['repository']['absolute_url']
owner = payload['repository']['owner']
local_repo = app.config['LOCAL_REPOS'].join(path)
@@ -47,6 +66,12 @@
if not check_for_local_repo(local_repo, remote_repo, owner):
print >> sys.stderr, 'Ignoring unknown repo', path
return
+ if test:
+ _do_handle(local_repo, payload, test)
+ else:
+ queue.put((local_repo, payload))
+
+def _do_handle(local_repo, payload, test=False):
scm.hg('pull', '-R', local_repo)
for commit in get_commits(payload):
for handler in HANDLERS:
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
@@ -23,8 +23,7 @@
translationArgs=crosstranslationargs + ['-O2'],
platform='linux-armel',
interpreter='pypy',
- prefix=['schroot', '-c', 'armel'],
- trigger='APPLVLLINUXARM_scheduler')
+ prefix=['schroot', '-c', 'armel'])
pypyJITCrossTranslationFactoryARM = pypybuilds.NightlyBuild(
translationArgs=(crosstranslationargs
@@ -51,6 +50,14 @@
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'])
+
pypyARMJITTranslatedTestFactory = pypybuilds.TranslatedTests(
translationArgs=(crosstranslationargs
+ jit_translation_args
@@ -100,6 +107,7 @@
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,
@@ -121,12 +129,13 @@
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
JITBACKENDONLYLINUXARMEL, # on hhu-imx.53
- JITBACKENDONLYLINUXARMHF, # on hhu-raspberry-pi
+ JITBACKENDONLYLINUXARMHF,
JITBACKENDONLYLINUXARMHF_v7, # on cubieboard-bob
], branch=None, hour=0, minute=0),
@@ -138,12 +147,12 @@
JITLINUXARM, # triggered by BUILDJITLINUXARM, on
hhu-beagleboard
]),
Triggerable("APPLVLLINUXARMHF_RASPBIAN_scheduler", [
- APPLVLLINUXARMHF_RASPBIAN, # triggered by BUILDLINUXARMHF_RASPBIAN,
on hhu-raspberry-pi
+ APPLVLLINUXARMHF_RASPBIAN, # triggered by BUILDLINUXARMHF_RASPBIAN
APPLVLLINUXARMHF_v7, # triggered by BUILDLINUXARMHF_RASPBIAN,
on cubieboard-bob
]),
Triggerable("JITLINUXARMHF_RASPBIAN_scheduler", [
- JITLINUXARMHF_RASPBIAN, # triggered by
BUILDJITLINUXARMHF_RASPBIAN, on hhu-raspberry-pi
+ JITLINUXARMHF_RASPBIAN, # triggered by
BUILDJITLINUXARMHF_RASPBIAN
JITLINUXARMHF_v7, # triggered by
BUILDJITLINUXARMHF_RASPBIAN, on cubieboard-bob
]),
]
@@ -162,7 +171,7 @@
# armhf
## armv6
{"name": JITBACKENDONLYLINUXARMHF,
- "slavenames": ['hhu-raspberry-pi'],
+ "slavenames": ['hhu-raspberry-pi', 'hhu-pypy-pi', 'hhu-pypy-pi2'],
"builddir": JITBACKENDONLYLINUXARMHF,
"factory": pypyJitBackendOnlyOwnTestFactoryARM,
"category": 'linux-armhf',
@@ -194,14 +203,14 @@
},
## armv6 hardfloat
{"name": APPLVLLINUXARMHF_RASPBIAN,
- "slavenames": ["hhu-raspberry-pi"],
+ "slavenames": ['hhu-raspberry-pi', 'hhu-pypy-pi', 'hhu-pypy-pi2'],
"builddir": APPLVLLINUXARMHF_RASPBIAN,
"factory": pypyARMHF_RASPBIAN_TranslatedAppLevelTestFactory,
"category": "linux-armhf",
"locks": [ARMBoardLock.access('counting')],
},
{"name": JITLINUXARMHF_RASPBIAN,
- "slavenames": ["hhu-raspberry-pi"],
+ "slavenames": ['hhu-raspberry-pi', 'hhu-pypy-pi', 'hhu-pypy-pi2'],
'builddir': JITLINUXARMHF_RASPBIAN,
'factory': pypyARMHF_RASPBIAN_JITTranslatedTestFactory,
'category': 'linux-armhf',
@@ -251,4 +260,11 @@
"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/master.py b/bot2/pypybuildbot/master.py
--- a/bot2/pypybuildbot/master.py
+++ b/bot2/pypybuildbot/master.py
@@ -181,9 +181,12 @@
CPYTHON_64 = "cpython-2-benchmark-x86-64"
-extra_opts= {'xerxes': {'keepalive_interval': 15},
+extra_opts = {'xerxes': {'keepalive_interval': 15},
'aurora': {'max_builds': 1},
'salsa': {'max_builds': 1},
+ 'hhu-raspberry-pi': {'max_builds': 1},
+ 'hhu-pypy-pi': {'max_builds': 1},
+ 'hhu-pypy-pi2': {'max_builds': 1},
}
BuildmasterConfig = {
@@ -204,7 +207,7 @@
APPLVLLINUX32, # on tannit32, uses 1 core
APPLVLLINUX64, # on allegro64, uses 1 core
# other platforms
- MACOSX32, # on minime
+ #MACOSX32, # on minime
JITWIN32, # on aurora
JITFREEBSD764, # on headless
JITFREEBSD864, # on ananke
diff --git a/bot2/pypybuildbot/pypylist.py b/bot2/pypybuildbot/pypylist.py
--- a/bot2/pypybuildbot/pypylist.py
+++ b/bot2/pypybuildbot/pypylist.py
@@ -28,6 +28,8 @@
'linux64': 50,
'osx': 30,
'win32': 10,
+ 'linux_armhf_raspbian': 7,
+ 'linux_armhf_raring': 6,
'linux_armel': 5,
}
@@ -66,6 +68,8 @@
name = self.filename.replace(ext, '')
# remove the dash from linux-armel, else the split does not work
name = name.replace('-armel', '_armel')
+ name = name.replace('-libc2', '_libc2')
+ name = name.replace('-armhf-ra', '_armhf_ra')
dashes = name.count('-')
if dashes == 4:
# svn based
diff --git a/master/public_html/summary.css b/master/public_html/summary.css
--- a/master/public_html/summary.css
+++ b/master/public_html/summary.css
@@ -73,6 +73,10 @@
border: 1px gray solid;
}
+div.header {
+ margin-top: 15px;
+}
+
div.footer {
font-size: 80%;
}
diff --git a/master/templates/summary.html b/master/templates/summary.html
--- a/master/templates/summary.html
+++ b/master/templates/summary.html
@@ -1,7 +1,7 @@
{% extends "layout.html" %}
{% block morehead %}
-<link rel="stylesheet" href="{{ path_to_root }}summary.css" type="text/css" />'
+<link rel="stylesheet" href="{{ path_to_root }}summary.css" type="text/css" />
<script language=javascript type='text/javascript'>
hiddenstates = [ ];
function togglestate(a, c) {
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
