diff --git a/runbot/runbot.py b/runbot/runbot.py index c4d63dec..0c149a27 100644 --- a/runbot/runbot.py +++ b/runbot/runbot.py @@ -420,7 +420,7 @@ class runbot_build(osv.osv): 'author': fields.char('Author'), 'subject': fields.text('Subject'), 'sequence': fields.integer('Sequence'), - 'result': fields.char('Result'), # ok, ko, warn, skipped + 'result': fields.char('Result'), # ok, ko, warn, skipped, killed 'pid': fields.integer('Pid'), 'state': fields.char('Status'), # pending, testing, running, done 'job': fields.char('Job'), # job_* @@ -754,7 +754,7 @@ class runbot_build(osv.osv): os.killpg(build.pid, signal.SIGKILL) except OSError: pass - build.write({'state':'done'}) + build.write({'state':'done', 'result': 'killed'}) cr.commit() self.pg_dropdb(cr, uid, "%s-base" % build.dest) self.pg_dropdb(cr, uid, "%s-all" % build.dest) diff --git a/runbot/runbot.xml b/runbot/runbot.xml index 0b82007e..b2ff544d 100644 --- a/runbot/runbot.xml +++ b/runbot/runbot.xml @@ -209,8 +209,9 @@ testing age time age time - age time + age time skipped + killed @@ -259,6 +260,12 @@ + @@ -345,6 +352,7 @@ warning success default + killed btn-group-sm