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

[Chris Johnston]

Creates KPI_RELEASES for defining what releases should exist in the KPI, adds touch results back to KPI

[Andy Doan (doanac)]

we still need to remove the old hack for quantal/raring:

        skipped_releases = ['quantal', 'raring']

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:660
http://10.97.0.26:8080/job/dashboard-ci/229/
Executed test runs:

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/dashboard-ci/229/rebuild

review: Approve (continuous-integration)

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

661. By Chris Johnston on 2013-10-23

Remove skipped releases per review

[Chris Johnston (cjohnston)]

review: Needs Resubmitting

[Andy Doan (doanac)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:661
http://10.97.0.26:8080/job/dashboard-ci/230/
Executed test runs:

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/dashboard-ci/230/rebuild

review: Approve (continuous-integration)

=== modified file 'smokeng/dashboard.py'
--- smokeng/dashboard.py	2013-09-27 18:49:06 +0000
+++ smokeng/dashboard.py	2013-10-23 16:14:52 +0000
@@ -30,6 +30,8 @@
 )
 from smokeng.tables import SmokeKPITable
 
+KPI_RELEASES = ['precise', 'trusty']
+
 
 class SmokengPassRateKPI(KPI):
     """
@@ -75,10 +77,9 @@
     def _get_result_data(self):
         qs = SmokeResult.objects.filter(
             publish=True,
+            image__release__in=KPI_RELEASES,
         ).exclude(
             image__build_number__contains='?',
-        ).exclude(
-            image__variant='touch',
         ).values(
             'image__arch',
             'image__variant',
@@ -247,11 +248,8 @@
 
         results = self._calculate_pass_rates()
 
-        skipped_releases = ['quantal', 'raring']
         entries = []
         for release in sorted(results.keys(), reverse=True):
-            if release in skipped_releases:
-                continue
             variants = results[release]
             variant_entries = []
             for variant in sorted(variants.keys(), reverse=True):