Author: David Schneider <[email protected]>
Branch:
Changeset: r700:8d21dd85a758
Date: 2012-09-13 16:12 +0200
http://bitbucket.org/pypy/buildbot/changeset/8d21dd85a758/
Log: Download nightly build for TranslatedTest builder based on the
SourceStamp provided when triggering the build instead of using
latest revision, which might differ from the one used for the build.
diff --git a/bot2/pypybuildbot/builds.py b/bot2/pypybuildbot/builds.py
--- a/bot2/pypybuildbot/builds.py
+++ b/bot2/pypybuildbot/builds.py
@@ -100,8 +100,9 @@
mastersrc = os.path.join(mastersrc, branch)
if revision is not None:
basename =
WithProperties(self.basename).getRenderingFor(self.build)
+ basename = basename.replace(':', '-')
else:
- basename = self.basename.replace('%(final_file_name)s', 'latest')
+ basename = self.basename.replace('%(revision)s', 'latest')
assert '%' not in basename
self.mastersrc = os.path.join(mastersrc, basename)
@@ -281,7 +282,9 @@
#
factory.addStep(CheckGotRevision(workdir=workdir))
-def build_name(platform, jit=False, flags=[]):
+def build_name(platform, jit=False, flags=[], placeholder=None):
+ if placeholder is None:
+ placeholder = '%(final_file_name)s'
if jit or '-Ojit' in flags:
kind = 'jit'
else:
@@ -293,7 +296,7 @@
kind = 'nojit'
else:
kind = 'unknown'
- return 'pypy-c-' + kind + '-%(final_file_name)s-' + platform
+ return 'pypy-c-' + kind + '-%s-' % (placeholder,) + platform
def get_extension(platform):
@@ -436,7 +439,7 @@
command= ['rm', '-rf', 'pypy-c'],
workdir='.'))
extension = get_extension(platform)
- name = build_name(platform, pypyjit, translationArgs) + extension
+ name = build_name(platform, pypyjit, translationArgs,
placeholder='%(revision)s') + extension
self.addStep(PyPyDownload(
basename=name,
mastersrc='~/nightly',
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
