NextERP/runbot
5
0
Fork 0
mirror of https://github.com/odoo/runbot.git synced 2025-03-15 23:45:44 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

[FIX] runbot: fix host id

Browse Source
This commit is contained in:
Xavier-Do 2024-08-08 15:39:13 +02:00
parent 917e39dd65
commit eaadd7886d
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
runbot/models/docker.py
View File

@ -287,7 +287,7 @@ class Dockerfile(models.Model):
'content': 'USER {USERNAME}', 'content': 'USER {USERNAME}',
}) })
def _build(self): def _build(self, host=None):
start = time.time() start = time.time()
docker_build_path = self.env['runbot.runbot']._path('docker', self.image_tag) docker_build_path = self.env['runbot.runbot']._path('docker', self.image_tag)
os.makedirs(docker_build_path, exist_ok=True) os.makedirs(docker_build_path, exist_ok=True)
@ -299,7 +299,7 @@ class Dockerfile(models.Model):
docker_build_identifier, msg = docker_build(docker_build_path, self.image_tag) docker_build_identifier, msg = docker_build(docker_build_path, self.image_tag)
duration = time.time() - start duration = time.time() - start
docker_build_result_values = {'dockerfile_id': self.id, 'output': msg, 'duration': duration, 'content': content, 'host_id': self.id} docker_build_result_values = {'dockerfile_id': self.id, 'output': msg, 'duration': duration, 'content': content, 'host_id': host and host.id}
duration = time.time() - start duration = time.time() - start
if docker_build_identifier: if docker_build_identifier:
docker_build_result_values['result'] = 'success' docker_build_result_values['result'] = 'success'
@ -315,7 +315,7 @@ class Dockerfile(models.Model):
# check previous result anyway # check previous result anyway
previous_result = self.env['runbot.docker_build_result'].search([ previous_result = self.env['runbot.docker_build_result'].search([
('dockerfile_id', '=', self.id), ('dockerfile_id', '=', self.id),
('host_id', '=', self.id), ('host_id', '=', host and host.id),
], order='id desc', limit=1) ], order='id desc', limit=1)
# identifier changed # identifier changed
if docker_build_identifier.id != previous_result.identifier: if docker_build_identifier.id != previous_result.identifier:

5
runbot/models/host.py
View File

@ -122,12 +122,9 @@ class Host(models.Model):
_logger.info('Building docker images...') _logger.info('Building docker images...')
self.ensure_one() self.ensure_one()
for dockerfile in self.env['runbot.dockerfile'].search([('to_build', '=', True)]): for dockerfile in self.env['runbot.dockerfile'].search([('to_build', '=', True)]):
self._docker_build_dockerfile(dockerfile) dockerfile._build(self)
_logger.info('Done...') _logger.info('Done...')
def _docker_build_dockerfile(self, dockerfile):
dockerfile._build()
@ormcache() @ormcache()
def _host_list(self): def _host_list(self):
return {host.name: host.id for host in self.search([])} return {host.name: host.id for host in self.search([])}