From 8284c7270d8d5c4a8aa9ca1fb9973856590235b7 Mon Sep 17 00:00:00 2001 From: Xavier-Do Date: Tue, 22 Oct 2019 11:40:46 +0200 Subject: [PATCH] [IMP] runbot: add message if docker does not match dest format --- runbot/models/repo.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/runbot/models/repo.py b/runbot/models/repo.py index 2d50eeaa..8ee64b69 100644 --- a/runbot/models/repo.py +++ b/runbot/models/repo.py @@ -577,12 +577,16 @@ class runbot_repo(models.Model): self.env['runbot.build']._local_cleanup() # 3. docker cleanup - containers = {int(dc.split('-', 1)[0]):dc for dc in docker_ps() if dest_reg.match(dc)} + docker_ps_result = docker_ps() + containers = {int(dc.split('-', 1)[0]):dc for dc in docker_ps_result if dest_reg.match(dc)} if containers: candidates = self.env['runbot.build'].search([('id', 'in', list(containers.keys())), ('local_state', '=', 'done')]) for c in candidates: _logger.info('container %s found running with build state done', containers[c.id]) docker_stop(containers[c.id]) + ignored = {dc for dc in docker_ps_result if not dest_reg.match(dc)} + if ignored: + _logger.debug('docker (%s) not deleted because not dest format', " ".join(list(ignored))) timeout = self._get_cron_period() icp = self.env['ir.config_parameter']