Merge lp:~cjohnston/qa-dashboard/primary-target-smoke into lp:qa-dashboard

[Chris Johnston]

Show only primary target devices for smoke touch(_ro) results by default

asac has requested that we only show the primary target devices by default when we look at the touch(_ro) results. This MP satisfies that request.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Andy Doan (doanac)]

On 08/27/2013 10:30 AM, Chris Johnston wrote:

> For more details, see:
> https://code.launchpad.net/~cjohnston/qa-dashboard/primary-target-smoke/+merge/182423

> === modified file 'smokeng/templates/smokeng/overview.html'
> --- smokeng/templates/smokeng/overview.html 2013-08-07 14:25:40 +0000
> +++ smokeng/templates/smokeng/overview.html 2013-08-27 15:21:28 +0000
> + {% if platform = 'mobile' %}

A nitpick, but "mobile" is probably a bad word. I'd say "phablet" is
probably the least bad of the bad options.

> + <h3 class='nav-title'>
> + TARGETS
> + </h3>
> + <ul class='left_nav'>
> + <li{% if targets = 'primary' %} class="active"{% endif %}>
> + <a href="{% url smokeng_overview release current %}">Primary targets</a>
> + {% if platform = 'mobile' and targets = 'primary' %}
> + <ul class='left_nav'>
> + <br />
> + <li><small>grouper: Nexus 7</small></li>
> + <li><small>manta: Nexus 10</small></li>
> + </ul>

I assume this is right, but it seems like you are show 7 and 10 as
primary targets?

> + {% endif %}
> + </li>
> + <li{% if targets != 'primary' %} class="active"{% endif %}>
> + <a href="{% url smokeng_overview release current %}?show_all=1">All targets</a>
> + {% if platform = 'mobile' and targets != 'primary' %}
> + <ul class='left_nav'>
> + <br />
> + <li><small>grouper: Nexus 7</small></li>
> + <li><small>manta: Nexus 10</small></li>
> + <li><small>grouper: Nexus 7</small></li>
> + <li><small>manta: Nexus 10</small></li>

I think you meant grouper, manta, maguro, mako here. not repeating
grouper/manta?

> - <ul class='left_nav'>
> - <li><small>maguro: Galaxy Nexus</small></li>
> + </h3>
> + <ul class='left_nav'>
> + <li><small>mako: Nexus 4</small></li>

is this a copy/paste bug. maguro seems to get deleted by this?
> <li><small>mako: Nexus 4</small></li>
> <li><small>grouper: Nexus 7</small></li>
> <li><small>manta: Nexus 10</small></li>
> - </ul>
> + </ul>
> + {% endif %}

> === modified file 'smokeng/views.py'

> + if variant == 'touch' or variant == 'touch_ro':
> + platform = 'mobile'
> + show_targets = request.GET.get('show_all')
> + if show_targets is None or show_targets != "1":
> + targets = 'primary'
> + results = results.filter(
> + image__arch__in=primary_targets,
> + )

I'm not a big fan of how this looks. Seems like we could change
config.py to have a function like:

def primary_targets(variant):
    if variant in ('touch', 'touch_ro'):
         return ('mako', 'maguro')

    return None

then you could have:

   primary_tgts = config.primary_targets(variant)
   if request.GET.get('show_all', '1') != '1' and primary_tgts:
       results = results.filter(image__arch__in=primary_tgts)

[Chris Johnston (cjohnston)]

review: Needs Resubmitting

[Andy Doan (doanac)]

review: Approve

[Chris Johnston (cjohnston)]

The attempt to merge lp:~cjohnston/qa-dashboard/primary-target-smoke into lp:qa-dashboard failed. Below is the output from the failed tests.

 * Adding ci
 * ci added.
 * Adding graphics
 * graphics added.
Creating test database for alias 'default'...
? You have no migrations for the 'performance' app. You might want some.
Destroying test database for alias 'default'...

.............EEEEEEEEEEEEEEE........................................WARNING:root:extension: 'error'
.....E...............EEEEEEEEEEEEEE.............................EEEEEEEEEEEEEEEEEEEEEEEEE.......EEEEEEEEE..........EEEEEEEEEEEEEEEEEEEEE.EEE
======================================================================
ERROR: test_bootspeed_api_arch_list_url (bootspeed.tests.TestBootspeedUrls)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/ubuntu/dash/bootspeed/tests.py", line 529, in test_bootspeed_api_arch_list_url
    'bootspeed_api_arch_list',
  File "/usr/lib/python2.7/dist-packages/django/core/urlresolvers.py", line 476, in reverse
    return iri_to_uri(resolver._reverse_with_prefix(view, prefix, *args, **kwargs))
  File "/usr/lib/python2.7/dist-packages/django/core/urlresolvers.py", line 363, in _reverse_with_prefix
    possibilities = self.reverse_dict.getlist(lookup_view)
  File "/usr/lib/python2.7/dist-packages/django/core/urlresolvers.py", line 276, in reverse_dict
    self._populate()
  File "/usr/lib/python2.7/dist-packages/django/core/urlresolvers.py", line 253, in _populate
    for name in pattern.reverse_dict:
  File "/usr/lib/python2.7/dist-packages/django/core/urlresolvers.py", line 276, in reverse_dict
    self._populate()
  File "/usr/lib/python2.7/dist-packages/django/core/urlresolvers.py", line 265, in _populate
    lookups.appendlist(pattern.callback, (bits, p_pattern, pattern.default_args))
  File "/usr/lib/python2.7/dist-packages/django/core/urlresolvers.py", line 216, in callback
    self._callback = get_callable(self._callback_str)
  File "/usr/lib/python2.7/dist-packages/django/utils/functional.py", line 27, in wrapper
    result = func(*args)
  File "/usr/lib/python2.7/dist-packages/django/core/urlresolvers.py", line 92, in get_callable
    lookup_view = getattr(import_module(mod_name), func_name)
  File "/usr/lib/python2.7/dist-packages/django/utils/importlib.py", line 35, in import_module
    __import__(name)
  File "/home/ubuntu/dash/smokeng/views.py", line 36, in <module>
    from smokeng.config import primary_targets
ImportError: No module named config

======================================================================
ERROR: test_bootspeed_api_arch_overall_url (bootspeed.tests.TestBootspeedUrls)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/ubuntu/dash/bootspeed/tests.py", line 544, in test_bootspeed_api_arch_overall_url
    args=args,
  File "/usr/lib/python2.7/dist-packages/django/core/urlresolvers.py", line 476, in reverse
    return iri_to_uri(resolver._reverse_with_prefix(view, prefix, *args, **kwargs))
  File "/usr/lib/python2.7/dist-packages/django/core/urlresolvers.py", line 363, in _reverse_wi...

[lp:~cjohnston/qa-dashboard/primary-target-smoke]

588. By Chris Johnston on 2013-08-30

Add support for showing only primary target devices smoke results

589. By Chris Johnston on 2013-08-30

Fixes touch displaying primary and all targets

[Chris Johnston (cjohnston)]

review: Needs Resubmitting

[Andy Doan (doanac)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

=== added file 'smokeng/config.py'
--- smokeng/config.py	1970-01-01 00:00:00 +0000
+++ smokeng/config.py	2013-08-30 19:26:41 +0000
@@ -0,0 +1,22 @@
+# QA Dashboard
+
+# Copyright 2013 Canonical Ltd.
+
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License version 3, as
+# published by the Free Software Foundation.
+
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU Affero General Public License for more details.
+
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+def primary_targets(variant):
+    if variant in ('touch', 'touch_ro'):
+        return ('mako', 'maguro')
+    else:
+        return None

=== added directory 'smokeng/static'
=== added directory 'smokeng/static/smokeng'
=== added directory 'smokeng/static/smokeng/css'
=== added file 'smokeng/static/smokeng/css/smokeng.css'
--- smokeng/static/smokeng/css/smokeng.css	1970-01-01 00:00:00 +0000
+++ smokeng/static/smokeng/css/smokeng.css	2013-08-30 19:26:41 +0000
@@ -0,0 +1,3 @@
+li.targets {
+  background-position: top left !important;
+}

=== modified file 'smokeng/templates/smokeng/overview.html'
--- smokeng/templates/smokeng/overview.html	2013-08-07 14:25:40 +0000
+++ smokeng/templates/smokeng/overview.html	2013-08-30 19:26:41 +0000
@@ -1,10 +1,13 @@
 {% extends "smokeng/smoke_layout.html" %}
-{% load dashboard_extras %}
+{% load dashboard_extras staticfiles %}
 {% load render_table from django_tables2 %}
 
 {% block page_name %}
 Image testing for {{ release|capfirst }}
 {% endblock %}
+{% block extra_headers %}
+<link href='{% static "smokeng/css/smokeng.css" %}' rel='stylesheet' type='text/css' /> 
+{% endblock extra_headers %}
 {% block content %}
 <div class='grid_15'>
   <h2>
@@ -39,15 +42,46 @@
     </li>
     {% endfor %}
   </ul>
-  <h3 class='nav-title'>
+  {% if current = 'touch' or current = 'touch_ro' %}
+    <h3 class='nav-title'>
+        TARGETS
+    </h3>
+    <ul class='left_nav'>
+      <li{% if targets = 'primary' %} class="active targets"{% endif %}>
+        <a href="{% url smokeng_overview release current %}">Primary targets</a>
+        {% if targets = 'primary' %}
+          <ul class='left_nav'>
+            <br />
+            <li><small>maguro: Galaxy Nexus</small></li>
+            <li><small>mako: Nexus 4</small></li>
+          </ul>
+        {% endif %}
+      </li>
+      <li{% if targets != 'primary' %} class="active targets"{% endif %}>
+        <a href="{% url smokeng_overview release current %}?show_all=1">All targets</a>
+        {% if targets != 'primary' %}
+          <ul class='left_nav'>
+            <br />
+            <li><small>maguro: Galaxy Nexus</small></li>
+            <li><small>mako: Nexus 4</small></li>
+            <li><small>grouper: Nexus 7</small></li>
+            <li><small>manta: Nexus 10</small></li>
+          </ul>
+        {% endif %}
+      </li>
+    </ul>
+  {% endif %}
+  {% if current != 'touch' and current != 'touch_ro' %}
+    <h3 class='nav-title'>
       DEVICE CODE NAMES
-  </h3>
-  <ul class='left_nav'>
+    </h3>
+    <ul class='left_nav'>
       <li><small>maguro: Galaxy Nexus</small></li>
       <li><small>mako: Nexus 4</small></li>
       <li><small>grouper: Nexus 7</small></li>
       <li><small>manta: Nexus 10</small></li>
-  </ul>
+    </ul>
+  {% endif %}
 </div>
 <div class='grid_13'>
   {% render_table table "table.html" %}

=== modified file 'smokeng/views.py'
--- smokeng/views.py	2013-08-19 16:34:44 +0000
+++ smokeng/views.py	2013-08-30 19:26:41 +0000
@@ -33,6 +33,7 @@
 from common.views import index
 from common.templatetags.dashboard_extras import decimal_to_percent
 
+from smokeng.config import primary_targets
 from smokeng.models import (
     SmokeImage,
     SmokeResult,
@@ -180,12 +181,17 @@
         publish=True,
         image__release=release,
     )
-
+    targets = ''
     if variant is not None:
         results = results.filter(
             image__variant=variant,
         )
 
+        primary_tgts = primary_targets(variant)
+        if request.GET.get('show_all') != '1' and primary_tgts:
+            targets = 'primary'
+            results = results.filter(image__arch__in=primary_tgts)
+
     results = results.values(
         'image__build_number',
         'image__variant',
@@ -226,6 +232,7 @@
         'releases': _get_releases(),
         'variants': variants,
         'current': variant,
+        'targets': targets,
         'active': release,
         'bread_crumb_trail': BreadCrumbTrail.leading_to(
             overview,