Merge ~laney/autopkgtest-cloud:master into autopkgtest-cloud:master

[Iain Lane]

This is a test

Unmerged commits

ab405a5... by Iain Lane on 2017-04-05

Allow many triggers

bf8141d... by Robert Bruce Park on 2017-04-04

Add retry link for test results.

diff --git a/webcontrol/templates/browse-results.html b/webcontrol/templates/browse-results.html
index 059b4ec..87516dd 100644
--- a/webcontrol/templates/browse-results.html
+++ b/webcontrol/templates/browse-results.html
@@ -19,7 +19,14 @@
       <td>{{row[2]}}</td>
       <td>{{row[3]}}</td>
       <td class="{{row[4]}}">{{row[4]}}</td>
-      <td><a href="{{row[5]}}/log.gz">log</a> &emsp; <a href="{{row[5]}}/artifacts.tar.gz">artifacts</a></td>
+      <td>
+        <a href="{{row[5]}}/log.gz">log</a> &emsp;
+        <a href="{{row[5]}}/artifacts.tar.gz">artifacts</a> &emsp;
+        {% if row[4] == 'fail' %}
+          {% set l = row[1].split()|join("&trigger=") %}
+          <a href="{{base_url}}request.cgi?release={{release}}&arch={{arch}}&package={{package}}&trigger={{l}}">retry</a>
+        {% endif %}
+      </td>
     </tr>
   {% endfor %}