wip

Author: Xavier-Do

runbot/models/build.py

@@ -345,6 +345,12 @@ class BuildResult(models.Model):
                                   string='Build type')
 
     parent_id = fields.Many2one('runbot.build', 'Parent Build', index=True)
+    parent_link_ids = fields.One2many('runbot.build.link', 'child_id', string='Used in links')
+    parent_ids = fields.Many2many('runbot.build', related='parent_link_ids.parent_id')
+
+    child_link_ids = fields.One2many('runbot.build.link', 'parent_id', string='Child links')
+
+    
     parent_path = fields.Char('Parent path', index=True)
     top_parent = fields.Many2one('runbot.build', compute='_compute_top_parent')
     ancestors = fields.Many2many('runbot.build', compute='_compute_ancestors')
@@ -525,7 +531,7 @@ def write(self, values):
 
         return res
 
-    def _add_child(self, param_values, orphan=False, description=False, additionnal_commit_links=False):
+    def _add_child(self, param_values, orphan=False, description=False, additionnal_commit_links=False, link=False):
         build_values = {key: value for key, value in param_values.items() if key not in self.params_id._fields}
         param_values = {key: value for key, value in param_values.items() if key in self.params_id._fields}
 
@@ -538,17 +544,40 @@ def _add_child(self, param_values, orphan=False, description=False, additionnal_
             commit_link_ids |= additionnal_commit_links
             param_values['commit_link_ids'] = commit_link_ids
 
-        return self.create({
-            'params_id': self.params_id.copy(param_values).id,
-            'parent_id': self.id,
+        params = self.params_id.copy(param_values)
+
+        build_values = {
+            'params_id': params.id,
             'build_type': self.build_type,
             'priority_level': self.priority_level,
             'description': description,
             'orphan_result': orphan,
             'keep_host': self.keep_host,
             'host': self.host if self.keep_host else False,
             **build_values,
-        })
+        }
+
+        if link:
+            existing_builds = params.build_ids
+            if self.keep_host:
+                existing_builds = existing_builds.filtered(lambda b: b.host == self.host)
+            if existing_builds:
+                build = existing_builds.sorted('id')[-1]
+                build.killable = False
+                
+            if build:
+                build = self.create(build_values)
+
+            self.env['runbot.build.link'].create({
+                'parent_id': self.id,
+                'child_id': link,
+            })
+            return build
+        else:
+            return self.create({
+                'parent_id': self.id,
+                **build_values,
+            })
 
     @api.depends('params_id.version_id.name')
     def _compute_dest(self):
@@ -1627,5 +1656,5 @@ class BuildLink(models.Model):
 
     parent_id = fields.Many2one('runbot.build', string='Parent Build', required=True, ondelete='cascade')
     child_id = fields.Many2one('runbot.build', string='Child Build', required=True, ondelete='cascade')
-    params_id = fields.Many2one('runbot.params', string='Params', related='child_id.params_id', store=True)
-    
+    params_id = fields.Many2one('runbot.build.params', string='Params', related='child_id.params_id', store=True)
+    orphan_result = fields.Boolean(string='Orphan Result', help='If set, the result of the child build will not be taken into account for the parent build result')

runbot/models/build_config.py

@@ -1013,7 +1013,7 @@ def get_reference_builds_for_versions(versions):
                         'version_id': target.params_id.version_id.id,
                         'trigger_id': None,
                         'dockerfile_id': target.params_id.dockerfile_id.id,
-                    })
+                    }, link=True)
                     source_description = source.params_id.version_id.name
                     target_description = target.params_id.version_id.name
                     if source in build.create_batch_id.slot_ids.build_id:
@@ -1026,12 +1026,12 @@ def get_reference_builds_for_versions(versions):
                         db.name,
                     )
 
-                    if self.allow_similar_build_quick_result:
-                        existing_done_build = next((build for build in child.params_id.build_ids.sorted('id') if build.global_state == 'done' and build.local_result not in ('skipped', 'killed')), None)
-                        if existing_done_build:
-                            child._log('', 'A similar [build](%s) has been found, marking as done directly', existing_done_build.build_url, log_type='markdown')
-                            child.local_state = 'done'
-                            child.local_result = existing_done_build.local_result
+                    #if self.allow_similar_build_quick_result:
+                    #    existing_done_build = next((build for build in child.params_id.build_ids.sorted('id') if build.global_state == 'done' and build.local_result not in ('skipped', 'killed')), None)
+                    #    if existing_done_build:
+                    #        child._log('', 'A similar [build](%s) has been found, marking as done directly', existing_done_build.build_url, log_type='markdown')
+                    #        child.local_state = 'done'
+                    #        child.local_result = existing_done_build.local_result
 
     def _filter_upgrade_database(self, dbs, pattern):
         pat_list = pattern.split(',') if pattern else []

runbot/models/runbot.py

@@ -127,9 +127,22 @@ def _gc_testing(self, host):
         if available_slots > 0 or nb_pending == 0:
             return
 
+        killable_build = []
+
         for build in testing_builds:
             if build.top_parent.killable:
-                build.top_parent._ask_kill(message='Build automatically killed, new build found.')
+                killable_build.append(build)
+                continue
+            if not build.parent_id and build.parent_ids:
+                killable_build.append(build)
+                continue
+
+        for build in killable_build:
+            build._log('_ask_kill', "Build automatically killed, new build found.")
+            if build.local_state == 'pending':
+                build._skip()
+            elif build.local_state in ['testing', 'running']:
+                build.requested_action = 'deathrow'
 
     def _allocate_builds(self, host, nb_slots, domain=None):
         if nb_slots <= 0: