Merge lp:~doanac/qa-dashboard/smoke-kpi-fix into lp:qa-dashboard

[Andy Doan]

smoke kpi: fix calculation

now that we have results that can be "running" and "syncing" we need to
update what we query for. Additionally I noticed that "pass_rate" wasn't
being set for results that were "syncing". I could have fixed this from
api.py, but it seemed better to do this in a single place and then
simplify our pull-script logic.

smoke kpi: fix calculation

now that we have results that can be "running" and "syncing" we need to
update what we query for. Additionally I noticed that "pass_rate" wasn't
being set for results that were "syncing". I could have fixed this from
api.py, but it seemed better to do this in a single place and then
simplify our pull-script logic.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:717
http://s-jenkins.ubuntu-ci:8080/job/dashboard-ci/303/
Executed test runs:

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

review: Approve (continuous-integration)

[Chris Johnston (cjohnston)]

review: Approve

=== modified file 'smokeng/dashboard.py'
--- smokeng/dashboard.py	2013-10-30 17:06:40 +0000
+++ smokeng/dashboard.py	2014-02-12 04:54:32 +0000
@@ -79,9 +79,9 @@
         qs = SmokeResult.objects.filter(
             publish=True,
             image__release__in=KPI_RELEASES,
+            status__in=(SmokeResult.COMPLETE, SmokeResult.SYNCING),
         ).exclude(
             image__build_number__contains='?',
-        ).exclude(
             image__variant__in=KPI_VARIANT_EXCLUDES,
         ).values(
             'image__arch',

=== modified file 'smokeng/management/commands/jenkins_pull_smokeng.py'
--- smokeng/management/commands/jenkins_pull_smokeng.py	2014-01-08 01:53:34 +0000
+++ smokeng/management/commands/jenkins_pull_smokeng.py	2014-02-12 04:54:32 +0000
@@ -216,13 +216,6 @@
 
         logging.info("Adding smoke result.")
 
-        pass_rate = 0.0
-
-        if dashboard_data['total'] != 0:
-            pass_rate = float(
-                dashboard_data['passes']
-            ) / dashboard_data['total']
-
         result, new_result = SmokeResult.objects.get_or_create(
             publish=True,
             image=self.image,
@@ -234,7 +227,6 @@
                 fail_count=dashboard_data['failures'],
                 error_count=dashboard_data['errors'],
                 total_count=dashboard_data['total'],
-                pass_rate=pass_rate,
                 status=SmokeResult.COMPLETE,
             )
         )
@@ -245,7 +237,6 @@
             result.fail_count = dashboard_data['failures']
             result.error_count = dashboard_data['errors']
             result.total_count = dashboard_data['total']
-            result.pass_rate = pass_rate
             result.status = SmokeResult.COMPLETE
             result.save()
 

=== modified file 'smokeng/models.py'
--- smokeng/models.py	2014-01-23 20:38:50 +0000
+++ smokeng/models.py	2014-02-12 04:54:32 +0000
@@ -194,6 +194,13 @@
     status = models.IntegerField(choices=STATUS_CHOICES, default=COMPLETE)
     pass_rate = models.FloatField(default=0.0)
 
+    def save(self, **kwargs):
+        '''ensure we store the pass_rate'''
+        self.pass_rate = 0
+        if self.total_count > 0:
+            self.pass_rate = float(self.pass_count) / self.total_count
+        return super(SmokeResult, self).save(**kwargs)
+
     @staticmethod
     def create_queued_results(image, build, tests):
         ran_at = datetime.datetime.now()