NextERP/runbot
5
0
Fork 0
mirror of https://github.com/odoo/runbot.git synced 2025-03-27 13:25:47 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

[FIX] runbot: fix keep_running

Browse Source 
Keep running was broken for since 5.0.
This commit fixes the broken logic and adds an index
This commit is contained in:
Xavier-Do 2021-08-04 10:19:13 +02:00 committed by Christophe Monniez
parent b7a5dc3d8c
commit 39eeb73f71
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
runbot/models/build.py
View File

@ -209,7 +209,7 @@ class BuildResult(models.Model):
build_url = fields.Char('Build url', compute='_compute_build_url', store=False) build_url = fields.Char('Build url', compute='_compute_build_url', store=False)
build_error_ids = fields.Many2many('runbot.build.error', 'runbot_build_error_ids_runbot_build_rel', string='Errors') build_error_ids = fields.Many2many('runbot.build.error', 'runbot_build_error_ids_runbot_build_rel', string='Errors')
keep_running = fields.Boolean('Keep running', help='Keep running') keep_running = fields.Boolean('Keep running', help='Keep running', index=True)
log_counter = fields.Integer('Log Lines counter', default=100) log_counter = fields.Integer('Log Lines counter', default=100)
slot_ids = fields.One2many('runbot.batch.slot', 'build_id') slot_ids = fields.One2many('runbot.batch.slot', 'build_id')

1
runbot/models/build_stat.py
View File

@ -8,6 +8,7 @@ _logger = logging.getLogger(__name__)
class BuildStat(models.Model): class BuildStat(models.Model):
_name = "runbot.build.stat" _name = "runbot.build.stat"
_description = "Statistics" _description = "Statistics"
_sql_constraints = [ _sql_constraints = [
( (
"build_config_key_unique", "build_config_key_unique",

4
runbot/models/runbot.py
View File

@ -88,9 +88,9 @@ class Runbot(models.AbstractModel):
running_max = host.get_running_max() running_max = host.get_running_max()
domain_host = self.build_domain_host(host) domain_host = self.build_domain_host(host)
Build = self.env['runbot.build'] Build = self.env['runbot.build']
cannot_be_killed_ids = Build.search(domain_host + [('keep_running', '!=', True)]).ids cannot_be_killed_ids = Build.search(domain_host + [('keep_running', '=', True)]).ids
sticky_bundles = self.env['runbot.bundle'].search([('sticky', '=', True)]) sticky_bundles = self.env['runbot.bundle'].search([('sticky', '=', True)])
cannot_be_killed_ids = [ cannot_be_killed_ids += [
build.id build.id
for build in sticky_bundles.mapped('last_batchs.slot_ids.build_id') for build in sticky_bundles.mapped('last_batchs.slot_ids.build_id')
if build.host == host.name if build.host == host.name