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

[IMP] runbot: faster docker update after change

Browse Source
This commit is contained in:
Xavier-Do 2024-08-06 10:03:40 +02:00 committed by Christophe Monniez
parent d2872f8e16
commit 9c6124d645
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
runbot/models/docker.py
View File

@ -21,7 +21,7 @@ class DockerLayer(models.Model):
_name = 'runbot.docker_layer' _name = 'runbot.docker_layer'
_inherit = 'mail.thread' _inherit = 'mail.thread'
_description = "Docker layer" _description = "Docker layer"
_order = 'sequence, id' _order = 'sequence,id'
name = fields.Char("Name", required=True) name = fields.Char("Name", required=True)
sequence = fields.Integer("Sequence", default=100, tracking=True) sequence = fields.Integer("Sequence", default=100, tracking=True)
@ -41,7 +41,7 @@ class DockerLayer(models.Model):
referencing_dockerlayer_ids = fields.One2many('runbot.docker_layer', 'reference_docker_layer_id', string='Layers referencing this one direcly', readonly=True) referencing_dockerlayer_ids = fields.One2many('runbot.docker_layer', 'reference_docker_layer_id', string='Layers referencing this one direcly', readonly=True)
all_referencing_dockerlayer_ids = fields.One2many('runbot.docker_layer', compute="_compute_references", string='Layers referencing this one', readonly=True) all_referencing_dockerlayer_ids = fields.One2many('runbot.docker_layer', compute="_compute_references", string='Layers referencing this one', readonly=True)
reference_count = fields.Integer('Number of references', compute='_compute_references') reference_count = fields.Integer('Number of references', compute='_compute_references')
has_xml_id = fields.Boolean(compute='_compute_has_xml_id', store=True) has_xml_id = fields.Boolean(compute='_compute_has_xml_id')
@api.depends('referencing_dockerlayer_ids', 'dockerfile_id.referencing_dockerlayer_ids') @api.depends('referencing_dockerlayer_ids', 'dockerfile_id.referencing_dockerlayer_ids')
def _compute_references(self): def _compute_references(self):

10
runbot/views/dockerfile_views.xml
View File

@ -21,12 +21,14 @@
<notebook> <notebook>
<page string="Layers"> <page string="Layers">
<field name="layer_ids"> <field name="layer_ids">
<tree> <tree default_order="sequence,id">
<field name="sequence" widget="handle"/> <field name="sequence" widget="handle"/>
<field name="rendered" decoration-it="layer_type in ('reference_layer', 'reference_file')" decoration-bg-info="layer_type == 'template'" decoration-bg-success="layer_type == 'raw'"/> <field name="rendered" decoration-it="layer_type in ('reference_layer', 'reference_file')" decoration-bg-info="layer_type == 'template' or (layer_type == 'reference_layer' and (packages or values))" decoration-bg-success="layer_type == 'raw'"/>
<field name="reference_count" string="#" decoration="True" decoration-bg-danger="referencing_dockerlayer_ids" decoration-bg-warning="reference_count != 0"/> <field name="reference_count" string="#" decoration="True" decoration-bg-danger="referencing_dockerlayer_ids" decoration-bg-warning="reference_count != 0"/>
<field name="referencing_dockerlayer_ids" column_invisible="True"/> <field name="referencing_dockerlayer_ids" column_invisible="True"/>
<field name="layer_type" column_invisible="True"/> <field name="layer_type" column_invisible="True"/>
<field name="packages" column_invisible="True"/>
<field name="values" column_invisible="True"/>
</tree> </tree>
</field> </field>
</page> </page>
@ -148,9 +150,11 @@
<field name="dockerfile_id"/> <field name="dockerfile_id"/>
<field name="layer_type"/> <field name="layer_type"/>
<field name="referencing_dockerlayer_ids" column_invisible="True"/> <field name="referencing_dockerlayer_ids" column_invisible="True"/>
<field name="packages" column_invisible="True"/>
<field name="values" column_invisible="True"/>
<field name="reference_count" string="#refs" decoration-danger="referencing_dockerlayer_ids" decoration-warning="reference_count != 0"/> <field name="reference_count" string="#refs" decoration-danger="referencing_dockerlayer_ids" decoration-warning="reference_count != 0"/>
<field name="all_referencing_dockerlayer_ids" string="#referencing" widget="many2many_tags"/> <field name="all_referencing_dockerlayer_ids" string="#referencing" widget="many2many_tags"/>
<field name="rendered" decoration-warning="layer_type in ('reference_layer', 'reference_file')" decoration-info="layer_type == 'template'" decoration-success="layer_type == 'raw'"/> <field name="rendered" decoration-warning="layer_type in ('reference_layer', 'reference_file')" decoration-info="layer_type == 'template' or (layer_type == 'reference_layer' and (packages or values))" decoration-success="layer_type == 'raw'"/>
</tree> </tree>
</field> </field>
</record> </record>

7
runbot_builder/builder.py
View File

@ -20,13 +20,18 @@ class BuilderClient(RunbotClient):
for repo in self.env['runbot.repo'].search([('mode', '!=', 'disabled')]): for repo in self.env['runbot.repo'].search([('mode', '!=', 'disabled')]):
repo._update(force=True) repo._update(force=True)
self.last_docker_update = None
def loop_turn(self): def loop_turn(self):
last_docker_update = max(self.env['runbot.dockerfile'].search([('to_build', '=', True)]).mapped('write_date'))
if self.count == 1 or self.last_docker_update != last_docker_update:
self.host._docker_build()
self.last_docker_update = last_docker_update
if self.count == 1: # cleanup at second iteration if self.count == 1: # cleanup at second iteration
self.env['runbot.runbot']._source_cleanup() self.env['runbot.runbot']._source_cleanup()
self.env['runbot.build']._local_cleanup() self.env['runbot.build']._local_cleanup()
self.env['runbot.runbot']._docker_cleanup() self.env['runbot.runbot']._docker_cleanup()
self.host._set_psql_conn_count() self.host._set_psql_conn_count()
self.host._docker_build()
self.env['runbot.repo']._update_git_config() self.env['runbot.repo']._update_git_config()
self.env.cr.commit() self.env.cr.commit()
self.git_gc() self.git_gc()