From 6d36455ef1035c779a138c446befaec0523adf78 Mon Sep 17 00:00:00 2001 From: Xavier-Do Date: Mon, 17 Jun 2019 18:05:01 +0200 Subject: [PATCH] [FIX] runbot: ensure that job and build end are always set. --- runbot/models/build.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/runbot/models/build.py b/runbot/models/build.py index 675708fb..5ddcc876 100644 --- a/runbot/models/build.py +++ b/runbot/models/build.py @@ -519,7 +519,6 @@ class runbot_build(models.Model): build.write(values) if not build.active_step: build._log('_schedule', 'No job in config, doing nothing') - #build._end_test() continue try: 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))) 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.write({'job_end': now()}) build._kill(result='killed') continue # No job running, make result and select nex job @@ -780,7 +778,9 @@ class runbot_build(models.Model): continue build._log('kill', 'Kill build %s' % build.dest) 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: v['local_result'] = result build.write(v)