From da1e4e78cae90920638634eddbbcbcb64e5a815c Mon Sep 17 00:00:00 2001 From: Xavier-Do Date: Thu, 19 Sep 2024 08:53:35 +0200 Subject: [PATCH] [FIX] runbot: only push if build was successfull --- runbot/models/docker.py | 5 +++-- runbot/models/host.py | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/runbot/models/docker.py b/runbot/models/docker.py index c61971a9..7687236c 100644 --- a/runbot/models/docker.py +++ b/runbot/models/docker.py @@ -323,11 +323,12 @@ class Dockerfile(models.Model): should_save_result = True if should_save_result: - result = self.env['runbot.docker_build_result'].create(docker_build_result_values) + build_result = self.env['runbot.docker_build_result'].create(docker_build_result_values) if not success: - message = f'Build failure, check results for more info ({result.summary})' + message = f'Build failure, check results for more info ({build_result.summary})' self.message_post(body=message) _logger.error(message) + return result class DockerBuildOutput(models.Model): diff --git a/runbot/models/host.py b/runbot/models/host.py index d3cdc1d9..27a7c93f 100644 --- a/runbot/models/host.py +++ b/runbot/models/host.py @@ -143,8 +143,8 @@ class Host(models.Model): else: _logger.info('Building docker images...') for dockerfile in self.env['runbot.dockerfile'].search([('to_build', '=', True)]): - dockerfile._build(self) - if is_registry: + result = dockerfile._build(self) + if result.get('image_id') and is_registry: docker_push(dockerfile.image_tag) _logger.info('Cleaning docker images...')