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: ensure that job and build end are always set.

Browse Source
This commit is contained in:
Xavier-Do 2019-06-17 18:05:01 +02:00 committed by XavierDo
parent af7a8b7d8b
commit 6d36455ef1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
runbot/models/build.py
View File

@ -519,7 +519,6 @@ class runbot_build(models.Model):
build.write(values) build.write(values)
if not build.active_step: if not build.active_step:
build._log('_schedule', 'No job in config, doing nothing') build._log('_schedule', 'No job in config, doing nothing')
#build._end_test()
continue continue
try: try:
build._log('_schedule', 'Init build environment with config %s ' % build.config_id.name) build._log('_schedule', 'Init build environment with config %s ' % build.config_id.name)
@ -544,7 +543,6 @@ class runbot_build(models.Model):
timeout = min(build.active_step.cpu_limit, int(icp.get_param('runbot.runbot_timeout', default=10000))) timeout = min(build.active_step.cpu_limit, int(icp.get_param('runbot.runbot_timeout', default=10000)))
if build.local_state != 'running' and build.job_time > timeout: if build.local_state != 'running' and build.job_time > timeout:
build._log('_schedule', '%s time exceeded (%ss)' % (build.active_step.name if build.active_step else "?", build.job_time)) build._log('_schedule', '%s time exceeded (%ss)' % (build.active_step.name if build.active_step else "?", build.job_time))
build.write({'job_end': now()})
build._kill(result='killed') build._kill(result='killed')
continue continue
# No job running, make result and select nex job # No job running, make result and select nex job
@ -780,7 +778,9 @@ class runbot_build(models.Model):
continue continue
build._log('kill', 'Kill build %s' % build.dest) build._log('kill', 'Kill build %s' % build.dest)
docker_stop(build._get_docker_name()) docker_stop(build._get_docker_name())
v = {'local_state': 'done', 'active_step': False, 'duplicate': False} # what if duplicate? state done? v = {'local_state': 'done', 'active_step': False, 'duplicate': False, 'build_end': now()} # what if duplicate? state done?
if not build.job_end:
v['job_end'] = now()
if result: if result:
v['local_result'] = result v['local_result'] = result
build.write(v) build.write(v)