Merge lp:~cjohnston/qa-dashboard/1207205 into lp:qa-dashboard

[Chris Johnston]

Add crash count to first and second smoke pages

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:576
http://s-jenkins:8080/job/dashboard-ci/155/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins:8080/job/dashboard-ci/155/rebuild

review: Approve (continuous-integration)

[lp:~cjohnston/qa-dashboard/1207205]

577. By Chris Johnston on 2013-08-16

Remove all the extra queries

[Chris Johnston (cjohnston)]

review: Needs Resubmitting

[lp:~cjohnston/qa-dashboard/1207205]

578. By Chris Johnston on 2013-08-16

Minor cleanup

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:577
http://s-jenkins:8080/job/dashboard-ci/156/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins:8080/job/dashboard-ci/156/rebuild

review: Approve (continuous-integration)

[Andy Doan (doanac)]

from models.py:

29 +
30 + for crashes in crash_count:
31 + if crashes['id'] == r['id']:
32 + r['crash_count'] += len(crashes)
33 +

does line 32 there need to change to "+= 1" like you've done in views.py?

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:578
http://s-jenkins:8080/job/dashboard-ci/158/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins:8080/job/dashboard-ci/158/rebuild

review: Approve (continuous-integration)

[lp:~cjohnston/qa-dashboard/1207205]

579. By Chris Johnston on 2013-08-16

By variant

[Chris Johnston (cjohnston)]

review: Needs Resubmitting

[lp:~cjohnston/qa-dashboard/1207205]

580. By Chris Johnston on 2013-08-16

Addresses Andy's comment about +1 v len

[Chris Johnston (cjohnston)]

review: Needs Resubmitting

[Andy Doan (doanac)]

review: Approve

[Chris Johnston (cjohnston)]

review: Approve

=== modified file 'smokeng/admin.py'
--- smokeng/admin.py	2013-07-10 16:56:19 +0000
+++ smokeng/admin.py	2013-08-16 15:27:05 +0000
@@ -24,11 +24,11 @@
 
 
 class SmokeImageAdmin(admin.ModelAdmin):
-    list_filter = ['release', 'variant', 'arch']
+    list_filter = ['publish', 'release', 'variant', 'arch']
     search_fields = [
         'build_number',
     ]
-    list_display = ('build_number', 'variant', 'arch', 'release')
+    list_display = ('build_number', 'variant', 'arch', 'release', 'publish')
     ordering = ['-build_number']
 
 
@@ -41,8 +41,9 @@
         'pass_count',
         'total_count',
         'ran_at',
+        'publish',
     )
-    list_filter = ['name']
+    list_filter = ['publish', 'name']
     search_fields = ['name']
     date_hierarchy = 'ran_at'
     ordering = ['image']
 
=== modified file 'smokeng/models.py'
--- smokeng/models.py	2013-07-30 21:05:41 +0000
+++ smokeng/models.py	2013-08-16 15:27:05 +0000
@@ -68,6 +68,12 @@
             'jenkins_build__job__url',
             'jenkins_build__build_number',
         )
+        crash_count = self.smokeresult_set.filter(
+            publish=True,
+            jenkins_build__artifact__name__contains='crash',
+        ).values(
+            'id',
+        )
 
         bugs = SmokeResultBug.objects.filter(
             result__image=self
@@ -100,6 +106,7 @@
         passrates = []
         for r in results:
             r['bugs'] = []
+            r['crash_count'] = 0
             data['pass_count'] += r['pass_count']
             data['fail_count'] += r['fail_count']
             data['error_count'] += r['error_count']
@@ -113,6 +120,11 @@
             for b in bugs:
                 if b['result__id'] == r['id']:
                     r['bugs'].append(b['bug__bug_no'])
+
+            for crashes in crash_count:
+                if crashes['id'] == r['id']:
+                    r['crash_count'] += 1
+
             results_copy.append(r)
 
         if len(passrates) == 0:
 
=== modified file 'smokeng/tables.py'
--- smokeng/tables.py	2013-08-16 14:59:45 +0000
+++ smokeng/tables.py	2013-08-16 15:27:05 +0000
@@ -25,6 +25,7 @@
             'pass_count',
             'fail_count',
             'error_count',
+            'crash_count',
             'pass_rate',
             'bugs',
         )
@@ -48,6 +49,10 @@
         verbose_name='error',
         attrs={'td': {'class': 'num'}},
     )
+    crash_count = tables.Column(
+        verbose_name='Crashes',
+        attrs={'td': {'class': 'num'}},
+    )
     pass_rate = tables.TemplateColumn(
         '{% load dashboard_extras %}'
         '{{ record.pass_rate|decimal_to_percent }}',
@@ -100,25 +105,6 @@
         },
     )
     ran_at = tables.Column()
-    logs = tables.TemplateColumn(
-        '{% if image.variant == "touch" and build_number >= "20130730" %}'
-        '<a href="{{ record.jenkins_build__job__url }}'
-        '{{ record.jenkins_build__build_number }}'
-        '/artifact/clientlogs/dmesg.log/*view*/">'
-        'dmesg</a>'
-        '&nbsp;&nbsp;&nbsp;'
-        '<a href="{{ record.jenkins_build__job__url }}'
-        '{{ record.jenkins_build__build_number }}'
-        '/artifact/clientlogs/">Artifacts</a>'
-        '{% else %}'
-        '<a href="{{ record.jenkins_build__job__url }}'
-        '{{ record.jenkins_build__build_number }}/artifact/">Artifacts</a>'
-        '{% endif %}'
-        '&nbsp;&nbsp;&nbsp;'
-        '<a href="{{ record.jenkins_build__job__url }}'
-        '{{ record.jenkins_build__build_number }}/console">Console Log</a>',
-        sortable=False
-    )
 
 
 class SmokeKPITable(tables.Table):
 
=== modified file 'smokeng/views.py'
--- smokeng/views.py	2013-08-07 14:25:40 +0000
+++ smokeng/views.py	2013-08-16 15:27:05 +0000
@@ -30,7 +30,6 @@
 )
 
 from common.views import index
-
 from common.templatetags.dashboard_extras import decimal_to_percent
 
 from smokeng.models import (
@@ -64,17 +63,15 @@
     ]
 
 
-def get_totals(
-    results,
-    release,
-):
+def get_totals(results, release):
     totals = {}
     passrates = {}
 
     bugs = _get_bugs(release)
+    crashes = _get_crashes()
     bug_data = {}
     for result in results:
-        _append_totals(totals, result)
+        _append_totals(totals, result, crashes)
         if result['total_count'] == 0:
             passrate = 0
         else:
@@ -105,6 +102,18 @@
     return totals, bug_data
 
 
+def _get_crashes():
+    crashes = SmokeResult.objects.filter(
+        publish=True,
+        jenkins_build__artifact__name__contains='crash',
+    ).values(
+        'image__build_number',
+        'image__arch',
+        'image__variant',
+    )
+    return crashes
+
+
 def _get_bugs(release):
 
     bugs = SmokeResultBug.objects.filter(
@@ -113,7 +122,7 @@
     return bugs
 
 
-def _append_totals(totals, result):
+def _append_totals(totals, result, crashes):
     key = result['image__id']
 
     if key not in totals:
@@ -126,8 +135,18 @@
             error_count=0,
             bugs=[],
             name=result['name'],
+            crash_count=0,
         )
 
+        for crash in crashes:
+            build_number = crash['image__build_number']
+            if (
+                build_number == result['image__build_number'] and
+                crash['image__arch'] == result['image__arch'] and
+                crash['image__variant'] == result['image__variant']
+            ):
+                totals[key]['crash_count'] += 1
+
         if 'image__variant' in result:
             totals[key]['variant'] = result['image__variant']
 
@@ -174,6 +193,7 @@
         'image__release',
         'name',
         'ran_at',
+        'jenkins_build',
     ).annotate(
         pass_count=models.Sum('pass_count'),
         fail_count=models.Sum('fail_count'),
@@ -187,6 +207,7 @@
         'image__release',
         'name',
         'ran_at',
+        'jenkins_build',
         'pass_count',
         'fail_count',
         'error_count',