diff --git a/runbot/__manifest__.py b/runbot/__manifest__.py index eab898c6..caca6ec9 100644 --- a/runbot/__manifest__.py +++ b/runbot/__manifest__.py @@ -6,7 +6,7 @@ 'author': "Odoo SA", 'website': "http://runbot.odoo.com", 'category': 'Website', - 'version': '5.8', + 'version': '5.9', 'application': True, 'depends': ['base', 'base_automation', 'website'], 'data': [ diff --git a/runbot/migrations/18.0.5.9/post-migration.py b/runbot/migrations/18.0.5.9/post-migration.py new file mode 100644 index 00000000..fc502cde --- /dev/null +++ b/runbot/migrations/18.0.5.9/post-migration.py @@ -0,0 +1,22 @@ +import logging + +_logger = logging.getLogger(__name__) + + +def migrate(cr, version): + # copy infor from ol build_reference_ids to slot_reference_ids + # old table is runbot_build_params_references + # new table is runbot_build_params_slot_references + cr.execute(""" + ALTER TABLE runbot_build_params_slot_references DISABLE TRIGGER ALL; + INSERT INTO runbot_build_params_slot_references (runbot_build_params_id, runbot_batch_slot_id) + SELECT ref.runbot_build_params_id, slot.id + FROM runbot_build_params_references ref + JOIN LATERAL ( + SELECT id + FROM runbot_batch_slot sl + WHERE sl.build_id = ref.runbot_build_id + LIMIT 1 + ) slot(id) ON TRUE; + ALTER TABLE runbot_build_params_slot_references ENABLE TRIGGER ALL; + """) diff --git a/runbot/models/batch.py b/runbot/models/batch.py index bd6f496d..730d69b6 100644 --- a/runbot/models/batch.py +++ b/runbot/models/batch.py @@ -397,7 +397,7 @@ class Batch(models.Model): 'used_custom_trigger': bool(trigger_custom), } - params_value['builds_reference_ids'] = trigger._reference_builds(self) + params_value['slot_reference_ids'] = [(4, s.id) for s in trigger._reference_slots(self)] params = self.env['runbot.build.params'].create(params_value) diff --git a/runbot/models/build.py b/runbot/models/build.py index 6815e8ca..ddaf41e9 100644 --- a/runbot/models/build.py +++ b/runbot/models/build.py @@ -69,7 +69,9 @@ class BuildParameters(models.Model): used_custom_trigger = fields.Boolean('Custom trigger was used to generate this build') build_ids = fields.One2many('runbot.build', 'params_id') - builds_reference_ids = fields.Many2many('runbot.build', relation='runbot_build_params_references', copy=True) + #builds_reference_ids = fields.Many2many('runbot.build', relation='runbot_build_params_references', copy=True) + builds_reference_ids = fields.Many2many('runbot.build', compute='_compute_builds_reference_ids') + slot_reference_ids = fields.Many2many('runbot.batch.slot', relation='runbot_build_params_slot_references', copy=True) modules = fields.Char('Modules') upgrade_to_build_id = fields.Many2one('runbot.build', index=True) # use to define sources to use with upgrade script @@ -96,7 +98,7 @@ class BuildParameters(models.Model): 'config_data': param.config_data.dict, 'modules': param.modules or '', 'commit_link_ids': sorted(param.commit_link_ids.commit_id.ids), - 'builds_reference_ids': sorted(param.builds_reference_ids.ids), + 'slot_reference_ids': sorted(param.slot_reference_ids.ids), 'upgrade_from_build_id': param.upgrade_from_build_id.id, 'upgrade_to_build_id': param.upgrade_to_build_id.id, 'dump_db': param.dump_db.id, @@ -110,6 +112,10 @@ class BuildParameters(models.Model): param.fingerprint = hashlib.sha256(str(cleaned_vals).encode('utf8')).hexdigest() + def _compute_builds_reference_ids(self): + for params in self: + params.builds_reference_ids = params.slot_reference_ids.build_id + @api.depends('commit_link_ids') def _compute_commit_ids(self): for params in self: diff --git a/runbot/models/build_config.py b/runbot/models/build_config.py index 0a4aa155..374c4efe 100644 --- a/runbot/models/build_config.py +++ b/runbot/models/build_config.py @@ -855,16 +855,16 @@ class ConfigStep(models.Model): return dict(cmd=cmd) - def _reference_builds(self, batch, trigger): + def _reference_slots(self, batch, trigger): upgrade_dumps_trigger_id = trigger.upgrade_dumps_trigger_id refs_batches = self._reference_batches(batch, trigger) - refs_builds = refs_batches.mapped('slot_ids').filtered( + refs_slots = refs_batches.mapped('slot_ids').filtered( lambda slot: slot.trigger_id == upgrade_dumps_trigger_id - ).mapped('build_id') + ) # should we filter on active? implicit. On match type? on skipped ? # is last_"done"_batch enough? # TODO active test false and take last done/running build limit 1 -> in case of rebuild - return refs_builds + return refs_slots def _is_upgrade_step(self): return self.job_type in ('configure_upgrade', 'configure_upgrade_complement') diff --git a/runbot/models/repo.py b/runbot/models/repo.py index 2f68d7eb..377fdc8a 100644 --- a/runbot/models/repo.py +++ b/runbot/models/repo.py @@ -118,13 +118,13 @@ class Trigger(models.Model): raise UserError('Upgrade trigger should have a config with step of type Configure Upgrade') return upgrade_step - def _reference_builds(self, batch): + def _reference_slots(self, batch): self.ensure_one() if self.upgrade_step_id: # this is an upgrade trigger, add corresponding builds custom_config = next((trigger_custom.config_id for trigger_custom in batch.bundle_id.trigger_custom_ids if trigger_custom.trigger_id == self), False) step = self._upgrade_step_from_config(custom_config) if custom_config else self.upgrade_step_id - refs_builds = step._reference_builds(batch, self) - return [(4, b.id) for b in refs_builds] + refs_slots = step._reference_slots(batch, self) + return refs_slots return [] def _get_version_domain(self): diff --git a/runbot/templates/batch.xml b/runbot/templates/batch.xml index cdbaab5c..3a6a5704 100644 --- a/runbot/templates/batch.xml +++ b/runbot/templates/batch.xml @@ -129,7 +129,7 @@ -
+
()
diff --git a/runbot/templates/build.xml b/runbot/templates/build.xml index cf65c083..15901e0d 100644 --- a/runbot/templates/build.xml +++ b/runbot/templates/build.xml @@ -134,10 +134,15 @@ Extra params:
- - Reference builds: -
- - + + Reference slots: +
+ + - + + + Missing build for slot - +