# HG changeset patch
# User osimons
# Date 1287653788 0
# Node ID 30134493d3c6411537bbd33413320c716941482a
# Parent 4b6ca8cfd8c6e4281bcc5a88e4659b92cdf2a58c
0.6dev: Merged [952:953] from trunk.
diff --git a/bitten/notify.py b/bitten/notify.py
--- a/bitten/notify.py
+++ b/bitten/notify.py
@@ -12,7 +12,7 @@
from trac.config import BoolOption
from trac.notification import NotifyEmail
from bitten.api import IBuildListener
-from bitten.model import Build, BuildStep, BuildLog
+from bitten.model import Build, BuildStep, BuildLog, TargetPlatform
class BittenNotify(Component):
@@ -123,6 +123,7 @@
def template_data(self):
failed_steps = BuildStep.select(self.env, build=self.build.id,
status=BuildStep.FAILURE)
+ platform = TargetPlatform.fetch(self.env, id=self.build.platform)
change = self.get_changeset()
return {
'build': {
@@ -130,6 +131,7 @@
'status': self.readable_states[self.build.status],
'link': self.build_link(),
'config': self.build.config,
+ 'platform': getattr(platform, 'name', 'unknown'),
'slave': self.build.slave,
'failed_steps': [{
'name': step.name,
diff --git a/bitten/templates/bitten_build.html b/bitten/templates/bitten_build.html
--- a/bitten/templates/bitten_build.html
+++ b/bitten/templates/bitten_build.html
@@ -28,6 +28,10 @@
$build.config.name
+ Platform:
+
+ $build.platform
+
Triggered by:
Changeset [$build.display_rev] by
diff --git a/bitten/templates/bitten_notify_email.txt b/bitten/templates/bitten_notify_email.txt
--- a/bitten/templates/bitten_notify_email.txt
+++ b/bitten/templates/bitten_notify_email.txt
@@ -5,6 +5,7 @@
Committed by: $change.author
Build Configuration: $build.config
+ Build Platform: $build.platform
Build Slave: $build.slave
Build Number: $build.id - <${build.link}>
{% if build.failed_steps %}\
diff --git a/bitten/web_ui.py b/bitten/web_ui.py
--- a/bitten/web_ui.py
+++ b/bitten/web_ui.py
@@ -54,8 +54,10 @@
BuildStep.IN_PROGRESS: 'in progress'}
def _get_build_data(env, req, build):
+ platform = TargetPlatform.fetch(env, build.platform)
data = {'id': build.id, 'name': build.slave, 'rev': build.rev,
'status': _status_label[build.status],
+ 'platform': getattr(platform, 'name', 'unknown'),
'cls': _status_label[build.status].replace(' ', '-'),
'href': req.href.build(build.config, build.id),
'chgset_href': req.href.changeset(build.rev)}
@@ -321,7 +323,7 @@
builds = []
# sort correctly by revision.
for build in sorted(in_progress_builds,
- cmp=lambda x, y: int(y.rev) - int(x.rev)):
+ cmp=lambda x, y: int(y.rev_time) - int(x.rev_time)):
rev = build.rev
build_data = _get_build_data(self.env, req, build)
build_data['rev'] = rev