vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix loading of partial caching under a tag

Browse source
This commit is contained in:
Joseph Schorr 2015-02-09 16:29:15 -05:00
parent b0e315c332
commit 9f1ec9d47d
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
buildman/jobutil/buildjob.py
View file

@ -92,16 +92,18 @@ class BuildJob(object):
repo_name = repo_build.repository.name repo_name = repo_build.repository.name
current_image = model.get_image(repo_build.repository, base_image_id) current_image = model.get_image(repo_build.repository, base_image_id)
next_image = None
if current_image is None: if current_image is None:
return None return None
# For each cache comment, find a child image that matches the command. # For each cache comment, find a child image that matches the command.
for cache_command in cache_commands: for cache_command in cache_commands:
full_command = '["/bin/sh", "-c", "%s"]' % cache_command full_command = '["/bin/sh", "-c", "%s"]' % cache_command
current_image = model.find_child_image(repo_build.repository, current_image, full_command) next_image = model.find_child_image(repo_build.repository, current_image, full_command)
if current_image is None: if next_image is None:
return None break
current_image = next_image
logger.debug('Found cached image %s for comment %s', current_image.id, full_command) logger.debug('Found cached image %s for comment %s', current_image.id, full_command)
# Find a tag associated with the image, if any. # Find a tag associated with the image, if any.