canonical-ubuntu-qa team mailing list archive

[Ural Tunaboyu <mp+477882@xxxxxxxxxxxxxxxxxx>]

Ural Tunaboyu has proposed merging ~uralt/autopkgtest-cloud:home-link-run-page into autopkgtest-cloud:master.

Requested reviews:
  Canonical's Ubuntu QA (canonical-ubuntu-qa)

For more details, see:
https://code.launchpad.net/~uralt/autopkgtest-cloud/+git/autopkgtest-cloud/+merge/477882

Small change on the home page to link to the most recent runs' /run/<uuid> pages, instead of displaying the info for each run and linking to /packages/<package>/<release>/<arch>.
-- 
Your team Canonical's Ubuntu QA is requested to review the proposed merge of ~uralt/autopkgtest-cloud:home-link-run-page into autopkgtest-cloud:master.

diff --git a/charms/focal/autopkgtest-web/webcontrol/browse.cgi b/charms/focal/autopkgtest-web/webcontrol/browse.cgi
index 0e77a98..67a4110 100755
--- a/charms/focal/autopkgtest-web/webcontrol/browse.cgi
+++ b/charms/focal/autopkgtest-web/webcontrol/browse.cgi
@@ -369,7 +369,7 @@ def index_root():
 
     recent = []
     for row in db_con.execute(
-        "SELECT exitcode, package, release, arch, triggers "
+        "SELECT exitcode, package, release, arch, triggers, uuid "
         "FROM result, test "
         "WHERE test.id == result.test_id "
         "ORDER BY run_id DESC "
@@ -377,7 +377,7 @@ def index_root():
     ):
         hc = human_exitcode(row[0])
         res = hc if "code" not in hc else "fail"
-        recent.append((res, row[1], row[2], row[3], row[4]))
+        recent.append((res, row[1], row[2], row[3], row[4], row[5]))
 
     return render("browse-home.html", indexes=indexes, recent_runs=recent)
 
diff --git a/charms/focal/autopkgtest-web/webcontrol/templates/browse-home.html b/charms/focal/autopkgtest-web/webcontrol/templates/browse-home.html
index be8d40f..e4ee001 100644
--- a/charms/focal/autopkgtest-web/webcontrol/templates/browse-home.html
+++ b/charms/focal/autopkgtest-web/webcontrol/templates/browse-home.html
@@ -7,9 +7,8 @@
         <div class="panel panel-default">
           <div class="panel-heading">Recent test runs</div>
           <div class="list-group">
-            {% for (res, pkg, rel, arch, trigs) in recent_runs %}
-              <a class="list-group-item"
-                 href="{{base_url}}packages/{{pkg}}/{{rel}}/{{arch}}">
+            {% for (res, pkg, rel, arch, trigs, uuid) in recent_runs %}
+              <a class="list-group-item" href="{{base_url}}run/{{uuid}}">
                 <span class="{{res}}">{{pkg}} on {{rel}}/{{arch}}</span>
                 <br />
                 <small class="text-muted">Triggers: {{trigs}}</small>