Merge lp:~cjohnston/qa-dashboard/smokeng-artifacts into lp:qa-dashboard

[Chris Johnston]

Add links to individual artifacts for smokeng

[lp:~cjohnston/qa-dashboard/smokeng-artifacts]

579. By Chris Johnston on 2013-08-19

Add links to artifacts for smokeng

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Andy Doan (doanac)]

I learned something new today: ›

review: Approve

=== modified file 'common/static/css/style.css'
--- common/static/css/style.css	2013-08-14 04:43:11 +0000
+++ common/static/css/style.css	2013-08-19 15:29:28 +0000
@@ -836,3 +836,40 @@
   overflow: hidden;
   text-overflow: ellipsis;
 }
+
+.list-ubuntu {
+  list-style: none;
+  margin-left: 0;
+  margin-top: 0;
+}
+
+.list-ubuntu li {
+  border-bottom: 1px dotted #aea79f;
+  margin-bottom: 0;
+  padding: 10px 0;
+}
+
+.list-ubuntu li.last-item,.list-ubuntu li:last-of-type {
+  border: 0;
+  padding-bottom: 0;
+}
+
+.list-ubuntu li {
+  background-repeat: no-repeat;
+  background-position: 0 15px;
+  padding-left: 25px;
+}
+
+.list-ubuntu li {
+  background-image: url("//assets.ubuntu.com/sites/ubuntu/latest/u/img/patterns/tick-orange.png");
+}
+    
+ul.artifacts {
+  float: left;
+}
+
+.artifacts li.last-item,
+.artifacts li:last-of-type {
+  padding-bottom: 10px!important;
+}
+

=== added file 'smokeng/templates/smokeng/artifacts.html'
--- smokeng/templates/smokeng/artifacts.html	1970-01-01 00:00:00 +0000
+++ smokeng/templates/smokeng/artifacts.html	2013-08-19 15:29:28 +0000
@@ -0,0 +1,14 @@
+<div class="box box-padded">
+    <h3><a href="{{ jenkins_url }}/artifact/">Artifacts &rsaquo;</a>&nbsp;&nbsp;&nbsp;<small><a href="{{ jenkins_url }}/console/">Console Log &rsaquo;</a></small></h3>
+  <div>
+    <ul class='list-ubuntu artifacts'>
+      {% for artifact in artifacts %}
+        <li><a href="{{ artifact.url }}/*view*/">{{ artifact.name }}</a></li>
+        {% if forloop.counter|divisibleby:'3' and not forloop.last %}
+          </ul>
+          <ul class='list-ubuntu artifacts'>
+        {% endif%}
+      {% endfor %}
+    </ul>
+  </div>
+</div>

=== modified file 'smokeng/templates/smokeng/test_result_detail.html'
--- smokeng/templates/smokeng/test_result_detail.html	2013-08-05 00:01:22 +0000
+++ smokeng/templates/smokeng/test_result_detail.html	2013-08-19 15:29:28 +0000
@@ -10,6 +10,8 @@
   <h2>
       Testcase: {{ testcase }}
   </h2>
+</div>
+<div class='grid_4'>
   <h4>Build data</h4>
   <table>
       <tr>
@@ -24,20 +26,12 @@
       <tr>
           <td><strong>Variant:</strong></td><td>{{ image.variant }}</td>
       </tr>
-      <tr>
-          <td><strong>Job data:</strong></td>
-          <td>
-              {% if image.variant == 'touch' and build_number >= '20130730' %}
-              <a href="{{ jenkins_url }}/artifact/clientlogs/dmesg.log/*view*/">dmesg</a>,
-              <a href="{{ jenkins_url }}/artifact/clientlogs/logcat.log/*view*/">logcat</a>,
-              <a href="{{ jenkins_url }}/artifact/clientlogs/">Artifacts</a>,
-              {% else %}
-              <a href="{{ jenkins_url }}/artifact/">Artifacts</a>,
-              {% endif %}
-              <a href="{{ jenkins_url }}/console">Console Log</a>
-          </td>
-      </tr>
   </table>
+</div>
+<div class='grid_10'>
+    {% include 'smokeng/artifacts.html' %}
+</div>
+<div class='grid_15'>
   <h4>Test case data</h4>
   <table>
       {% for entry in results %}

=== modified file 'smokeng/templates/smokeng/test_results.html'
--- smokeng/templates/smokeng/test_results.html	2013-08-07 14:25:40 +0000
+++ smokeng/templates/smokeng/test_results.html	2013-08-19 15:29:28 +0000
@@ -13,6 +13,8 @@
   <h2>
     Test case results
   </h2>
+</div>
+<div class='grid_4'>
   <table>
       <tr>
           <td><strong>Build #:</strong></td><td><a href="{{ jenkins_url }}">{{ build_number }}</a></td>
@@ -41,26 +43,16 @@
       <tr>
           <td><strong>Pass rate:</strong></td><td>{{ totals.rate }}</td>
       </tr>
-      <tr>
-          <td><strong>Job data:</strong></td>
-          <td>
-              {% if image.variant == 'touch' and build_number >= '20130730' %}
-              <a href="{{ jenkins_url }}/artifact/clientlogs/dmesg.log/*view*/">dmesg</a>,
-              <a href="{{ jenkins_url }}/artifact/clientlogs/logcat.log/*view*/">logcat</a>,
-              <a href="{{ jenkins_url }}/artifact/clientlogs/">Artifacts</a>,
-              {% else %}
-              <a href="{{ jenkins_url }}/artifact/">Artifacts</a>,
-              {% endif %}
-              <a href="{{ jenkins_url }}/console">Console Log</a>
-          </td>
-      </tr>
   </table>
-  <p>
-  </p>
-    {% if tests %}
+</div>
+<div class='grid_9'>
+    {% include 'smokeng/artifacts.html' %}
+</div>
+<div class='grid_15'>
+  {% if tests %}
     {% render_table table "table.html" %}
-    {% else %}
+  {% else %}
     <p>No test case results found</p>
-    {% endif %}
+  {% endif %}
  </div>
-  {% endblock %}
+{% endblock %}

=== modified file 'smokeng/views.py'
--- smokeng/views.py	2013-08-16 15:20:39 +0000
+++ smokeng/views.py	2013-08-19 15:29:28 +0000
@@ -29,6 +29,7 @@
     BreadCrumbTrail,
 )
 
+from common.models import Artifact
 from common.views import index
 from common.templatetags.dashboard_extras import decimal_to_percent
 
@@ -293,6 +294,9 @@
         publish=True,
         result=result,
     )
+    artifacts = Artifact.objects.filter(
+        jenkins_build=result.jenkins_build,
+    ).order_by('name')
 
     jenkins_url = (
         result.jenkins_build.job.url +
@@ -334,6 +338,7 @@
         'totals': totals,
         'jenkins_url': jenkins_url,
         'table': table,
+        'artifacts': artifacts,
         'bread_crumb_trail': BreadCrumbTrail.leading_to(
             image_test_results,
             release=release,
@@ -360,6 +365,9 @@
         SmokeTestResult,
         pk=id,
     )
+    artifacts = Artifact.objects.filter(
+        jenkins_build=test.result.jenkins_build,
+    ).order_by('name')
 
     results = []
     test_data = dict(
@@ -386,6 +394,7 @@
         'release': test.result.image.release,
         'jenkins_url': jenkins_url,
         'testcase': test.testcase,
+        'artifacts': artifacts,
         'bread_crumb_trail': BreadCrumbTrail.leading_to(
             test_result_detail,
             release=release,