Merge lp:~cjohnston/qa-dashboard/smokeng-kpi-sort-fix into lp:qa-dashboard

[Chris Johnston]

Fixes sorting issues with touch_ro kpi version numbers

[Joe Talbott (joetalbott)]

Review: Approve

Awesome!

[Chris Johnston (cjohnston)]

Voting does not meet specified criteria. Required: Approve >= 1. Got: 2 Pending.

[Joe Talbott (joetalbott)]

On Tue, Sep 10, 2013 at 02:25:23PM -0000, Chris Johnston wrote:
> The proposal to merge lp:~cjohnston/qa-dashboard/smokeng-kpi-sort-fix into lp:qa-dashboard has been updated.
>
> Status: Approved => Needs review
>
> For more details, see:
> https://code.launchpad.net/~cjohnston/qa-dashboard/smokeng-kpi-sort-fix/+merge/184786
> --
> https://code.launchpad.net/~cjohnston/qa-dashboard/smokeng-kpi-sort-fix/+merge/184786
> Your team QA Dashboard Developers is requested to review the proposed merge of lp:~cjohnston/qa-dashboard/smokeng-kpi-sort-fix into lp:qa-dashboard.

Review: Approve

[Joe Talbott (joetalbott)]

review: Approve

=== modified file 'smokeng/dashboard.py'
--- smokeng/dashboard.py	2013-08-22 16:13:28 +0000
+++ smokeng/dashboard.py	2013-09-10 14:16:27 +0000
@@ -54,7 +54,7 @@
     def _get_result_bug_count(self, build_number, variant=None):
         qs = SmokeResultBug.objects.filter(
             publish=True,
-            result__image__build_number=build_number,
+            result__image__rootfs_id=build_number,
             result__image__variant=variant,
         ).values(
             'result__image__release',
@@ -87,9 +87,10 @@
             'image__variant',
             'image__release',
             'image__build_number',
+            'image__rootfs_id',
         ).annotate(
             avg_pass_rate=models.Avg('pass_rate'),
-        ).order_by('-image__build_number')
+        ).order_by('-image__rootfs_id')
 
         return qs
 
@@ -108,11 +109,12 @@
                 entry['image__arch'],
                 {},
             ).setdefault(
-                entry['image__build_number'],
+                entry['image__rootfs_id'],
                 {},
             )
 
             build.setdefault('pass_rates', []).append(entry['avg_pass_rate'])
+            build.setdefault('build_number', entry['image__build_number'])
 
         return entry_tree
 
@@ -154,6 +156,10 @@
                             'pass_rate',
                             arch_build['pass_rate'],
                         )
+                        res_arch.setdefault(
+                            'full_build_number',
+                            arch_build['build_number'],
+                        )
 
                         if build > res_arch['latest_build_number']:
                             res_arch['latest_build_number'] = build
@@ -397,6 +403,7 @@
                 has_expected_build = False
                 for arch in sorted(arches.keys()):
                     data = arches[arch]
+                    full_build_number = data['full_build_number']
                     build_no = data['latest_build_number']
                     if build_no == expected_build:
                         arch_passrates.append(data['pass_rate'])
@@ -419,6 +426,7 @@
                     variant=variant,
                     results=dict(
                         build_no=build_no,
+                        full_build_number=full_build_number,
                         pass_rate=pass_rate,
                         found_arches=found_arches,
                         bug_count=bug_count,

=== modified file 'smokeng/templates/smokeng/kpi_variant_pass_rate.html'
--- smokeng/templates/smokeng/kpi_variant_pass_rate.html	2013-09-04 14:49:38 +0000
+++ smokeng/templates/smokeng/kpi_variant_pass_rate.html	2013-09-10 14:16:27 +0000
@@ -12,7 +12,7 @@
     <tr>
         <td><a href='{% url "smokeng_overview" release.release kpi.variant %}'>{{ kpi.variant }}</a></td>
         <td>
-            {{ kpi.results.build_no }}
+            {{ kpi.results.full_build_number }}
     </td>
     <td class="num pad-seven {{ kpi.results.pass_rate|pass_rate_color }}">
       <a class="css-tooltip no-border" href="#">