changeset 875:a68027e2245d

Add 'Platform' name to build report for web display and notifications. Fixes #541 and #633.
author osimons
date Thu, 21 Oct 2010 08:41:16 +0000
parents e695efec5b28
children 86073ad1d9ba
files bitten/notify.py bitten/templates/bitten_build.html bitten/templates/bitten_notify_email.txt bitten/web_ui.py
diffstat 4 files changed, 10 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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,
--- a/bitten/templates/bitten_build.html
+++ b/bitten/templates/bitten_build.html
@@ -28,6 +28,10 @@
         <dd class="config">
           <a href="$build.config.href">$build.config.name</a>
         </dd>
+        <dt class="platform">Platform:</dt>
+        <dd class="platform">
+          $build.platform
+        </dd>
         <dt class="trigger">Triggered by:</dt>
         <dd class="trigger">
           Changeset <a href="$build.chgset_href">[$build.display_rev]</a> by 
--- 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 %}\
--- 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)}
Copyright (C) 2012-2017 Edgewall Software