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

[Chris Johnston]

Update smoke artifact links to point to clientlogs/ for newer touch results

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:545
http://s-jenkins:8080/job/dashboard-ci/134/
Executed test runs:

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

review: Needs Fixing (continuous-integration)

[Andy Doan (doanac)]

review: Approve

=== modified file 'smokeng/tables.py'
--- smokeng/tables.py	2013-07-31 01:54:43 +0000
+++ smokeng/tables.py	2013-08-05 00:08:27 +0000
@@ -99,12 +99,11 @@
         '   '
         '<a href="{{ record.jenkins_build__job__url }}'
         '{{ record.jenkins_build__build_number }}'
-        '/artifact/clientlogs/logcat.log/*view*/">'
-        'logcat</a>'
-        '&nbsp;&nbsp;&nbsp;'
+        '/artifact/clientlogs/">Artifacts</a>'
+        '{% else %}'
+        '<a href="{{ record.jenkins_build__job__url }}'
+        '{{ record.jenkins_build__build_number }}/artifact/">Artifacts</a>'
         '{% endif %}'
-        '<a href="{{ record.jenkins_build__job__url }}'
-        '{{ record.jenkins_build__build_number }}/artifact/">Artifacts</a>'
         '&nbsp;&nbsp;&nbsp;'
         '<a href="{{ record.jenkins_build__job__url }}'
         '{{ record.jenkins_build__build_number }}/console">Console Log</a>',
 
=== modified file 'smokeng/templates/smokeng/test_result_detail.html'
--- smokeng/templates/smokeng/test_result_detail.html	2013-07-31 01:54:43 +0000
+++ smokeng/templates/smokeng/test_result_detail.html	2013-08-05 00:08:27 +0000
@@ -30,8 +30,10 @@
               {% 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 }}/artifact/">Artifacts</a>,
               <a href="{{ jenkins_url }}/console">Console Log</a>
           </td>
       </tr>
 
=== modified file 'smokeng/templates/smokeng/test_results.html'
--- smokeng/templates/smokeng/test_results.html	2013-07-31 01:54:43 +0000
+++ smokeng/templates/smokeng/test_results.html	2013-08-05 00:08:27 +0000
@@ -47,8 +47,10 @@
               {% 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 }}/artifact/">Artifacts</a>,
               <a href="{{ jenkins_url }}/console">Console Log</a>
           </td>
       </tr>