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

[IMP] runbot: mark killed builds as "killed"

Browse Source
This commit is contained in:
Christophe Simonis 2014-06-19 14:12:04 +02:00
parent a82488bce5
commit 43470bb8df
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
runbot/runbot.py
View File

@ -420,7 +420,7 @@ class runbot_build(osv.osv):
'author': fields.char('Author'), 'author': fields.char('Author'),
'subject': fields.text('Subject'), 'subject': fields.text('Subject'),
'sequence': fields.integer('Sequence'), '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'), 'pid': fields.integer('Pid'),
'state': fields.char('Status'), # pending, testing, running, done 'state': fields.char('Status'), # pending, testing, running, done
'job': fields.char('Job'), # job_* 'job': fields.char('Job'), # job_*
@ -754,7 +754,7 @@ class runbot_build(osv.osv):
os.killpg(build.pid, signal.SIGKILL) os.killpg(build.pid, signal.SIGKILL)
except OSError: except OSError:
pass pass
build.write({'state':'done'}) build.write({'state':'done', 'result': 'killed'})
cr.commit() cr.commit()
self.pg_dropdb(cr, uid, "%s-base" % build.dest) self.pg_dropdb(cr, uid, "%s-base" % build.dest)
self.pg_dropdb(cr, uid, "%s-all" % build.dest) self.pg_dropdb(cr, uid, "%s-all" % build.dest)

10
runbot/runbot.xml
View File

@ -209,8 +209,9 @@
<t t-if="bu.state=='testing'"><i class="text-info fa fa-spinner"/> testing <t t-esc="bu.job[4:]"/> <small><t t-esc="s2h(bu.job_time)"/></small></t> <t t-if="bu.state=='testing'"><i class="text-info fa fa-spinner"/> testing <t t-esc="bu.job[4:]"/> <small><t t-esc="s2h(bu.job_time)"/></small></t>
<t t-if="bu.result=='ok'"><i class="text-success fa fa-thumbs-up"/><small> age <t t-esc="s2h(bu.job_age)"/> time <t t-esc="s2h(bu.job_time)"/></small></t> <t t-if="bu.result=='ok'"><i class="text-success fa fa-thumbs-up"/><small> age <t t-esc="s2h(bu.job_age)"/> time <t t-esc="s2h(bu.job_time)"/></small></t>
<t t-if="bu.result=='ko'"><i class="text-danger fa fa-thumbs-down"/><small> age <t t-esc="s2h(bu.job_age)"/> time <t t-esc="s2h(bu.job_time)"/></small></t> <t t-if="bu.result=='ko'"><i class="text-danger fa fa-thumbs-down"/><small> age <t t-esc="s2h(bu.job_age)"/> time <t t-esc="s2h(bu.job_time)"/></small></t>
<t t-if="bu.result=='warn'"><i class="text-warning fa fa-thumbs-down"/><small> age <t t-esc="s2h(bu.job_age)"/> time <t t-esc="s2h(bu.job_time)"/></small></t> <t t-if="bu.result=='warn'"><i class="text-warning fa fa-warning"/><small> age <t t-esc="s2h(bu.job_age)"/> time <t t-esc="s2h(bu.job_time)"/></small></t>
<t t-if="bu.result=='skipped'"><i class="text-danger fa fa-ban"/> skipped</t> <t t-if="bu.result=='skipped'"><i class="text-danger fa fa-ban"/> skipped</t>
<t t-if="bu.result=='killed'"><i class="label-danger fa fa-times"/> killed</t>
</template> </template>
<template id="runbot.build_button"> <template id="runbot.build_button">
@ -259,6 +260,12 @@
<t t-if="refresh"> <t t-if="refresh">
<meta http-equiv="refresh" t-att-content="refresh"/> <meta http-equiv="refresh" t-att-content="refresh"/>
</t> </t>
<style>
.killed {
background-color: #555;
color: #fff;
}
</style>
</t> </t>
<div class="container" style="width: 100%;"> <div class="container" style="width: 100%;">
<div class="row"> <div class="row">
@ -345,6 +352,7 @@
<t t-if="bu.state in ['running','done'] and bu.result == 'warn'"><t t-set="klass">warning</t></t> <t t-if="bu.state in ['running','done'] and bu.result == 'warn'"><t t-set="klass">warning</t></t>
<t t-if="bu.state in ['running','done'] and bu.result == 'ok'"><t t-set="klass">success</t></t> <t t-if="bu.state in ['running','done'] and bu.result == 'ok'"><t t-set="klass">success</t></t>
<t t-if="bu.state in ['running','done'] and bu.result == 'skipped'"><t t-set="klass">default</t></t> <t t-if="bu.state in ['running','done'] and bu.result == 'skipped'"><t t-set="klass">default</t></t>
<t t-if="bu.state in ['running','done'] and bu.result == 'killed'"><t t-set="klass">killed</t></t>
<td t-attf-class="{{klass}}"> <td t-attf-class="{{klass}}">
<t t-call="runbot.build_button"><t t-set="klass">btn-group-sm</t></t> <t t-call="runbot.build_button"><t t-set="klass">btn-group-sm</t></t>
<t t-if="bu.subject"> <t t-if="bu.subject">