[FIX] runbot: kill children even if state is done

This commit is contained in:
Xavier-Do 2019-06-18 13:28:14 +02:00
parent ae1eed46f5
commit 2fb0f2c79a
3 changed files with 10 additions and 9 deletions

View File

@ -806,9 +806,9 @@ class runbot_build(models.Model):
elif build.local_state in ['testing', 'running']:
build.write({'local_state': 'deathrow'})
build._log('_ask_kill', 'Killing build %s, requested by %s (user #%s)' % (build.dest, user.name, uid))
for child in build.children_ids: # should we filter build that are target of a duplicate_id?
if not build.duplicate_id and build.local_state != 'done':
child._ask_kill()
for child in build.children_ids: # should we filter build that are target of a duplicate_id?
if not build.duplicate_id and build.local_state != 'done':
child._ask_kill()
def _cmd(self): # why not remove build.modules output ?
"""Return a tuple describing the command to start the build

View File

@ -40,7 +40,6 @@
</t>
<t t-esc="build.subject" />
</td>
<td><t t-esc="build.name" /></td>
<td><t t-esc="build.global_result" /></td>
<td><t t-esc="build.global_state" /></td>
<td><t t-esc="build.real_build.host" /></td>

View File

@ -66,11 +66,13 @@
<li><a t-attf-href="http://{{bu['domain']}}/?db={{bu['real_build'].dest}}-base">Connect base <i class="fa fa-sign-in"></i></a></li>
<li><a t-attf-href="http://{{bu['domain']}}/">Connect <i class="fa fa-sign-in"></i></a></li>
</t>
<li t-if="bu.global_state in ['done','running','deathrow'] and bu_index==0" groups="base.group_user">
<a href="#" class="runbot-rebuild" t-att-data-runbot-build="bu['id']"
title="Create a new build keeping build commit head, but will recompute all other info (config, dependencies, extra_params)">
Default Rebuild <i class="fa fa-refresh"/>
</a>
<li t-if="bu.global_state in ['done','running','deathrow']" groups="base.group_user">
<t t-if="bu_index==0">
<a href="#" class="runbot-rebuild" t-att-data-runbot-build="bu['id']"
title="Create a new build keeping build commit head, but will recompute all other info (config, dependencies, extra_params)">
Default Rebuild <i class="fa fa-refresh"/>
</a>
</t>
<a href="#" class="runbot-rebuild-exact" t-att-data-runbot-build="bu['id']"
title="Create a new build keeping all build info (config, dependencies, extra_params)">
Exact Rebuild <i class="fa fa-refresh"/>