summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorElliot Smith <elliot.smith@intel.com>2015-10-15 15:45:14 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-10-16 14:13:23 +0100
commit65e8bde9f1e055e4d01dd13b72c9c88c6447dcdb (patch)
tree858b7d39045827fc4ebc3f343aaf5acb90b77f66 /bitbake
parent93f0b61749155ba600f38dff5604a68da548c486 (diff)
downloadpoky-65e8bde9f1e055e4d01dd13b72c9c88c6447dcdb.tar.gz
bitbake: toaster: Remove Toaster exceptions section of build dashboard
Fatal build errors were displayed as exceptions, and highlighted with less severity than they deserved. Roll back to treating Toaster exceptions as errors by removing the toaster_exceptions member on Build objects and displaying EXCEPTION events in the errors section on the dashboard. [YOCTO #8320] (Bitbake rev: 59197320bdcefddf06084e871f1b5b21b21cbb63) Signed-off-by: Elliot Smith <elliot.smith@intel.com> Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/toaster/orm/models.py4
-rw-r--r--bitbake/lib/toaster/toastergui/templates/builddashboard.html45
2 files changed, 4 insertions, 45 deletions
diff --git a/bitbake/lib/toaster/orm/models.py b/bitbake/lib/toaster/orm/models.py
index 6ca45e0997..a784b1bf7a 100644
--- a/bitbake/lib/toaster/orm/models.py
+++ b/bitbake/lib/toaster/orm/models.py
@@ -348,10 +348,6 @@ class Build(models.Model):
348 return Build.BUILD_OUTCOME[int(self.outcome)][1] 348 return Build.BUILD_OUTCOME[int(self.outcome)][1]
349 349
350 @property 350 @property
351 def toaster_exceptions(self):
352 return self.logmessage_set.filter(level=LogMessage.EXCEPTION)
353
354 @property
355 def errors(self): 351 def errors(self):
356 return (self.logmessage_set.filter(level=LogMessage.ERROR) | 352 return (self.logmessage_set.filter(level=LogMessage.ERROR) |
357 self.logmessage_set.filter(level=LogMessage.EXCEPTION) | 353 self.logmessage_set.filter(level=LogMessage.EXCEPTION) |
diff --git a/bitbake/lib/toaster/toastergui/templates/builddashboard.html b/bitbake/lib/toaster/toastergui/templates/builddashboard.html
index fc6cae6f29..75ca8bc2c0 100644
--- a/bitbake/lib/toaster/toastergui/templates/builddashboard.html
+++ b/bitbake/lib/toaster/toastergui/templates/builddashboard.html
@@ -44,14 +44,6 @@
44 44
45{%endif%} 45{%endif%}
46 </div> 46 </div>
47 {% if build.toaster_exceptions.count > 0 %}
48 <div class="row">
49 <small class="pull-right">
50 <i class="icon-question-sign get-help get-help-blue" title="" data-original-title="Toaster exceptions do not affect your build: only the operation of Toaster"></i>
51 <a class="show-exceptions" href="#exceptions">Toaster threw {{build.toaster_exceptions.count}} exception{{build.toaster_exceptions.count|pluralize}}</a>
52 </small>
53 </div>
54 {% endif %}
55 </div> 47 </div>
56</div> 48</div>
57 49
@@ -69,12 +61,10 @@
69 <div class="accordion-body collapse in" id="collapse-errors"> 61 <div class="accordion-body collapse in" id="collapse-errors">
70 <div class="accordion-inner"> 62 <div class="accordion-inner">
71 <div class="span10"> 63 <div class="span10">
72 {% for error in logmessages %} 64 {% for error in build.errors %}
73 {% if error.level == 2 or error.level == 3 %} 65 <div class="alert alert-error">
74 <div class="alert alert-error"> 66 <pre>{{error.message}}</pre>
75 <pre>{{error.message}}</pre> 67 </div>
76 </div>
77 {% endif %}
78 {% endfor %} 68 {% endfor %}
79 </div> 69 </div>
80 </div> 70 </div>
@@ -271,33 +261,6 @@
271</div> 261</div>
272{% endif %} 262{% endif %}
273 263
274
275{% if build.toaster_exceptions.count > 0 %}
276<div class="accordion span10 pull-right" id="exceptions">
277 <div class="accordion-group">
278 <div class="accordion-heading">
279 <a class="accordion-toggle exception toggle-exceptions">
280 <h2 id="exception-toggle">
281 <i class="icon-warning-sign"></i>
282 {{build.toaster_exceptions.count}} Toaster exception{{build.toaster_exceptions.count|pluralize}}
283 </h2>
284 </a>
285 </div>
286 <div class="accordion-body collapse" id="collapse-exceptions">
287 <div class="accordion-inner">
288 <div class="span10">
289 {% for exception in build.toaster_exceptions %}
290 <div class="alert alert-exception">
291 <pre>{{exception.message}}</pre>
292 </div>
293 {% endfor %}
294 </div>
295 </div>
296 </div>
297 </div>
298</div>
299{% endif %}
300
301<script type="text/javascript"> 264<script type="text/javascript">
302 $(document).ready(function() { 265 $(document).ready(function() {
303 //show warnings section when requested from the previous page 266 //show warnings section when requested from the previous page