1. Pypy
  2. Untitled project
  3. buildbot

Commits

David Schneider  committed 8d21dd8

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.

  • Participants
  • Parent commits 2efa368
  • Branches default

Comments (0)

Files changed (1)

File bot2/pypybuildbot/builds.py

View file
         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)
     #
     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:
             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):
             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',