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

[Chris Johnston]

Shows smoke kpi per variant per release

Due to the potential massive differences between the different variants, we should display the kpi per variant per release

Also floats kpi 'help' to the right side of the kpi's

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

582. By Chris Johnston on 2013-08-22

Add smoke kpi by variant

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Andy Doan (doanac)]

i didn't notice how/why this is needed:

32 +.r {
33 + position: relative!important;
34 + margin: 0!important;
35 + background: transparent!important;
36 + padding: 0!important;
37 +}

[Andy Doan (doanac)]

dashboard.py is started to get a bit out of control. But I suppose carrying around that baggage might be handy some day

[Chris Johnston (cjohnston)]

Andy, the css change was required to be able to do the coloring.

[Andy Doan (doanac)]

review: Approve

=== modified file 'bootspeed/templates/bootspeed/kpi_simple_average.html'
--- bootspeed/templates/bootspeed/kpi_simple_average.html	2013-07-03 15:12:46 +0000
+++ bootspeed/templates/bootspeed/kpi_simple_average.html	2013-08-22 16:13:38 +0000
@@ -3,7 +3,7 @@
     <strong>Build:</strong> {{ build_number }}
     {% endif %}
     {% if help_info %}
-    <a class="css-tooltip no-border" href="#"><div class="help">?</div><span class="classic">
+    <a class="css-tooltip no-border" href="#"><div class="help kpihelp">?</div><span class="classic">
         {{ help_info }}
     </span></a>
     {% endif %}
 
=== modified file 'common/static/css/style.css'
--- common/static/css/style.css	2013-08-19 15:25:18 +0000
+++ common/static/css/style.css	2013-08-22 16:13:38 +0000
@@ -764,6 +764,10 @@
   width: 25px;
 }
 
+div.kpihelp {
+  float: right;
+}
+
 .css-tooltip {
   border-bottom: 1px dotted #000000;
   color: #000000; outline: none;
@@ -873,3 +877,9 @@
   padding-bottom: 10px!important;
 }
 
+.r {
+  position: relative!important;
+  margin: 0!important;
+  background: transparent!important;
+  padding: 0!important;
+}
 
=== modified file 'eventstat/templates/eventstat/kpi_simple_average.html'
--- eventstat/templates/eventstat/kpi_simple_average.html	2013-07-03 15:12:46 +0000
+++ eventstat/templates/eventstat/kpi_simple_average.html	2013-08-22 16:13:38 +0000
@@ -3,7 +3,7 @@
     <strong>Build:</strong> {{ build_number }}
     {% endif %}
     {% if help_info %}
-    <a class="css-tooltip no-border" href="#"><div class="help">?</div><span class="classic">
+    <a class="css-tooltip no-border" href="#"><div class="help kpihelp">?</div><span class="classic">
         {{ help_info }}
     </span></a>
     {% endif %}
 
=== modified file 'smokeng/dashboard.py'
--- smokeng/dashboard.py	2013-08-14 02:44:00 +0000
+++ smokeng/dashboard.py	2013-08-22 16:13:38 +0000
@@ -51,10 +51,11 @@
     def importance(self):
         return self.IMPORTANCE_HIGH
 
-    def _get_result_bug_count(self, build_number):
+    def _get_result_bug_count(self, build_number, variant=None):
         qs = SmokeResultBug.objects.filter(
             publish=True,
             result__image__build_number=build_number,
+            result__image__variant=variant,
         ).values(
             'result__image__release',
             'bug__bug_no',
@@ -79,8 +80,11 @@
     def _get_result_data(self):
         qs = SmokeResult.objects.filter(
             publish=True,
+        ).exclude(
+            image__build_number__contains='?',
         ).values(
             'image__arch',
+            'image__variant',
             'image__release',
             'image__build_number',
         ).annotate(
@@ -98,6 +102,9 @@
                 entry['image__release'],
                 {},
             ).setdefault(
+                entry['image__variant'],
+                {},
+            ).setdefault(
                 entry['image__arch'],
                 {},
             ).setdefault(
@@ -115,45 +122,51 @@
         TREND_ENTRIES = 7
 
         results = {}
-        for release, arches in entry_tree.items():
-            #print("release: {}, arches: {}".format(release, arches))
-            for arch_name, arch in arches.items():
-                res_arch = results.setdefault(
-                    release,
-                    {},
-                ).setdefault(
-                    arch_name,
-                    {},
-                )
-                keys = arch.keys()
-                item_count = min(len(keys), TREND_ENTRIES)
-                for build in sorted(keys, reverse=True)[:item_count]:
-                    res_arch.setdefault(
-                        'latest_build_number',
-                        build
-                    )
-
-                    arch_build = arch[build]
-                    arch_build['pass_rate'] = 0
-                    if len(arch_build['pass_rates']) > 0:
-                        pr_sum = sum(arch_build['pass_rates'])
-                        pr_len = len(arch_build['pass_rates'])
-                        arch_build['pass_rate'] = pr_sum / pr_len
-
-                    res_arch.setdefault('pass_rate', arch_build['pass_rate'])
-
-                    if build > res_arch['latest_build_number']:
-                        res_arch['latest_build_number'] = build
-                        res_arch['pass_rate'] = arch_build['pass_rate']
-
-                    res_arch.setdefault('data', []).append(
-                        dict(
-                            release=release,
-                            arch=arch_name,
-                            build_number=build,
-                            pass_rate=arch_build['pass_rate'],
-                        )
-                    )
+        for release, variants in entry_tree.items():
+            for variant, arches in variants.items():
+                for arch_name, arch in arches.items():
+                    res_arch = results.setdefault(
+                        release,
+                        {},
+                    ).setdefault(
+                        variant,
+                        {},
+                    ).setdefault(
+                        arch_name,
+                        {},
+                    )
+                    keys = arch.keys()
+
+                    item_count = min(len(keys), TREND_ENTRIES)
+                    for build in sorted(keys, reverse=True)[:item_count]:
+                        res_arch.setdefault(
+                            'latest_build_number',
+                            build
+                        )
+                        arch_build = arch[build]
+                        arch_build['pass_rate'] = 0
+                        if len(arch_build['pass_rates']) > 0:
+                            pr_sum = sum(arch_build['pass_rates'])
+                            pr_len = len(arch_build['pass_rates'])
+                            arch_build['pass_rate'] = pr_sum / pr_len
+
+                        res_arch.setdefault(
+                            'pass_rate',
+                            arch_build['pass_rate'],
+                        )
+
+                        if build > res_arch['latest_build_number']:
+                            res_arch['latest_build_number'] = build
+                            res_arch['pass_rate'] = arch_build['pass_rate']
+
+                        res_arch.setdefault('data', []).append(
+                            dict(
+                                release=release,
+                                arch=arch_name,
+                                build_number=build,
+                                pass_rate=arch_build['pass_rate'],
+                            )
+                        )
 
         return results
 
@@ -326,6 +339,113 @@
         return retval
 
 
+class SmokengVariantPassRateKPI(SmokengPassRateKPI):
+    """
+    A simple KPI entry with an average pass-rate for each variant in each
+    release.
+
+    This KPI determines the latest build number for each variant and shows
+    an average of those results for each release.
+
+    To identify missing images a list of architectures used to calculate
+    the pass-rate for each release are listed.
+
+    A count of bugs filed by the QA Team is also included.
+
+    """
+
+    def _get_latest_build_number(self, results, release, variant):
+
+        build_numbers = []
+
+        if release in results and variant in results[release]:
+            for arch, a_data in results[release][variant].items():
+                build_numbers.append(a_data['latest_build_number'])
+
+        if len(build_numbers) == 0:
+            return ""
+
+        # TODO: fix so it's sorted by float(build_number)
+        return sorted(build_numbers, reverse=True)[0]
+
+    def render(self):
+
+        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):
+                found_arches = []
+                arches = results[release][variant]
+                expected_build = self._get_latest_build_number(
+                    results,
+                    release,
+                    variant,
+                )
+
+                bug_counts = self._get_result_bug_count(
+                    expected_build,
+                    variant,
+                )
+
+                arch_passrates = []
+                has_expected_build = False
+                for arch in sorted(arches.keys()):
+                    data = arches[arch]
+                    build_no = data['latest_build_number']
+                    if build_no == expected_build:
+                        arch_passrates.append(data['pass_rate'])
+                        found_arches.append(arch)
+                        has_expected_build = True
+
+                pass_rate = 0.0
+
+                if len(arch_passrates) > 0:
+                    pass_rate = sum(arch_passrates) / len(arch_passrates)
+
+                bug_count = bug_counts.get(release, 0)
+
+                if has_expected_build:
+                    build_no = expected_build
+                else:
+                    build_no = ''
+
+                variant_kpi = dict(
+                    variant=variant,
+                    results=dict(
+                        build_no=build_no,
+                        pass_rate=pass_rate,
+                        found_arches=found_arches,
+                        bug_count=bug_count,
+                    ),
+                )
+                variant_entries.append(variant_kpi)
+            release_kpi = dict(
+                release=release,
+                kpi=variant_entries,
+            )
+            entries.append(release_kpi)
+
+        retval = render_to_string(
+            'smokeng/kpi_variant_pass_rate.html',
+            dict(
+                entries=entries,
+                help_info="""The average pass_rate for each variant is
+                calculated by accounting for each architecture (i.e. "amd64",
+                "i386", "armhf") in the variant.  These averages are averaged
+                for each release being tracked.  Hover over the pass rate
+                for each release for the number of bugs reported.""",
+            ),
+        )
+
+        return retval
+
+
 class SmokengExtension(Extension):
     URL_PATTERNS = patterns(
         '',
@@ -343,7 +463,7 @@
 
     def contribute_to_kpis(self, kpi_mgr):
         return [
-            SmokengPassRateV3KPI,
+            SmokengVariantPassRateKPI,
         ]
 
     def pull_data(self):
 
=== added file 'smokeng/templates/smokeng/kpi_variant_pass_rate.html'
--- smokeng/templates/smokeng/kpi_variant_pass_rate.html	1970-01-01 00:00:00 +0000
+++ smokeng/templates/smokeng/kpi_variant_pass_rate.html	2013-08-22 16:13:38 +0000
@@ -0,0 +1,32 @@
+{% load dashboard_extras %}
+    {% if help_info %}
+    <a class="css-tooltip no-border" href="#"><div class="help kpihelp">?</div><span class="classic">
+        {{ help_info }}
+    </span></a>
+    {% endif %}
+    {% for release in entries %}
+    <strong>{{ release.release|capfirst }}</strong>
+    <table class="kpi">
+    {% for kpi in release.kpi %}
+    <tr>
+        <td><a href="{% url smokeng_overview release.release kpi.variant %}">{{ kpi.variant }}</a></td>
+        <td>
+            {{ kpi.results.build_no }}
+    </td>
+    <td class="num pad-seven {{ kpi.results.pass_rate|pass_rate_color }}">
+      <a class="css-tooltip no-border" href="#">
+          <div class="r" style="color: {% if kpi.results.pass_rate|pass_rate_color == "yellow" %}#000;{% else %}#fff;{% endif %}">
+            {{ kpi.results.pass_rate|decimal_to_percent }}</div>
+          <span class="classic">
+            {{ kpi.results.bug_count }} Bug{% if kpi.results.bug_count > 1 %}s{% endif %}
+          </span>
+      </a>
+    </td>
+    <td class="pad-seven">
+        {% if kpi.results.found_arches %}{% for arch in kpi.results.found_arches %}{{ arch|product_name }}{% if not forloop.last %}, {% endif %}{% endfor %}
+    {% endif %}
+    </td>
+  </tr>
+{% endfor %}
+</table>
+{% endfor %}