Author: Ronan Lamy <[email protected]>
Branch:
Changeset: r1038:33fc33e373e0
Date: 2017-11-06 19:29 +0000
http://bitbucket.org/pypy/buildbot/changeset/33fc33e373e0/
Log: Use testrunner/get_info.py to get the name of the pypy executable
diff --git a/bot2/pypybuildbot/builds.py b/bot2/pypybuildbot/builds.py
--- a/bot2/pypybuildbot/builds.py
+++ b/bot2/pypybuildbot/builds.py
@@ -4,11 +4,12 @@
from buildbot.process import factory
from buildbot.steps import shell, transfer
from buildbot.steps.trigger import Trigger
-from buildbot.process.properties import WithProperties, Interpolate
+from buildbot.process.properties import WithProperties, Interpolate, Property
from buildbot import locks
from pypybuildbot.util import symlink_force
from buildbot.status.results import SKIPPED, SUCCESS
import os
+import json
# buildbot supports SlaveLocks, which can be used to limit the amout of builds
# to be run on each slave in parallel. However, they assume that each
@@ -375,6 +376,7 @@
alwaysUseLatest=alwaysUseLatest,
logEnviron=False))
+
def setup_steps(platform, factory, workdir=None,
repourl='https://bitbucket.org/pypy/pypy/',
force_branch=None):
@@ -392,6 +394,14 @@
#
factory.addStep(CheckGotRevision(workdir=workdir))
+ def extract_info(rc, stdout, stderr):
+ if rc == 0:
+ return json.loads(stdout)
+ else:
+ return {}
+ factory.addStep(shell.SetPropertyFromCommand(
+ command=['python', 'testrunner/get_info.py'],
+ extract_fn=extract_info))
def build_name(platform, jit=False, flags=[], placeholder=None):
if placeholder is None:
@@ -457,11 +467,10 @@
timeout=4000,
env={"TMPDIR": Interpolate('%(prop:target_tmpdir)s' + pytest),
}))
- test_interpreter = '../build/pypy/goal/pypy-c'
factory.addStep(ShellCmd(
description="Create virtualenv",
- command=prefix + ['virtualenv', '--clear', '-p', test_interpreter,
- 'pypy-venv'],
+ command=prefix + ['virtualenv', '--clear', '-p',
+ Property('target_path'), 'pypy-venv'],
workdir='venv',
flunkOnFailure=True))
if platform == 'win32':
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
