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: trigger with no config fallback

Browse Source
This commit is contained in:
Xavier-Do 2022-11-09 12:25:03 +01:00 committed by Christophe Monniez
parent f72c4a8baa
commit 2ca7a3de6e
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
runbot/models/batch.py
View File

@ -296,16 +296,15 @@ class Batch(models.Model):
for trigger_custom in self.bundle_id.trigger_custom_ids: for trigger_custom in self.bundle_id.trigger_custom_ids:
trigger_customs[trigger_custom.trigger_id] = trigger_custom trigger_customs[trigger_custom.trigger_id] = trigger_custom
for trigger in triggers: for trigger in triggers:
trigger_custom = trigger_customs.get(trigger) trigger_custom = trigger_customs.get(trigger, self.env['runbot.bundle.trigger.custom'])
trigger_repos = trigger.repo_ids | trigger.dependency_ids trigger_repos = trigger.repo_ids | trigger.dependency_ids
if trigger_repos & missing_repos: if trigger_repos & missing_repos:
self.warning('Missing commit for repo %s for trigger %s', (trigger_repos & missing_repos).mapped('name'), trigger.name) self.warning('Missing commit for repo %s for trigger %s', (trigger_repos & missing_repos).mapped('name'), trigger.name)
continue continue
# in any case, search for an existing build # in any case, search for an existing build
config = trigger_custom.config_id or trigger.config_id
config = trigger_custom.config_id if trigger_custom else trigger.config_id extra_params = trigger_custom.extra_params or ''
extra_params = trigger_custom.extra_params if trigger_custom else '' config_data = trigger_custom.config_data or {}
config_data = trigger_custom.config_data if trigger_custom else {}
params_value = { params_value = {
'version_id': version_id, 'version_id': version_id,
'extra_params': extra_params, 'extra_params': extra_params,