Merge ~hyask/autopkgtest-cloud:skia/package_link into autopkgtest-cloud:master

[Skia]

[Tim Andersson (andersson123)]

One "Needs fixing":
- I think the first commit message, "helper" isn't too clear. Change to "helpers" and also mention the commit affects tests.py - It's not exactly a helper function we use in the actual infra so I think that should be specified, otherwise the commit message isn't exactly descriptive of the change

One "Nice to have":
- Is there a way for us to check if a "generic" launchpad url like [1] is valid for a specified package and only add the hyperlink if the page is valid? I just think even though it makes the change a bit more complicated, why not add it now if we can :P

[1] https://bugs.launchpad.net/auto-package-testing

review: Needs Fixing

[Skia (hyask)]

Fixed the commit message, thanks, it's changed.

For the nice to have, there is two problems:
  * it's really hard to verify from a Jinja template that the link is valid: we would have to perform the check from Python and generate the link there, but that feel absolutely overkill for what we want.
  * `auto-package-testing` is not a package, it's a project, so it doesn't make sense to make a link pointing there, where would it be? Sometimes, both links exist [1], but given that we're linking from autopkgtest, the package page makes more sense than the project page, I think.

[1]: see curtin, for example:
project: https://launchpad.net/curtin
package: https://launchpad.net/ubuntu/+source/curtin

[Tim Andersson (andersson123)]

Yes, I believe the first bullet point you mention is the only way to go about it. I think it's something we should think about and maybe do in the future.

What about checking a URL like this:
https://bugs.launchpad.net/ubuntu/+source/curtin

?

Package definitely makes more sense than project page though.

If you want to implement the bug link as well, go ahead. Otherwise, this LGTM!

review: Approve

diff --git a/charms/focal/autopkgtest-web/webcontrol/helpers/tests.py b/charms/focal/autopkgtest-web/webcontrol/helpers/tests.py
index 504e855..de23699 100644
--- a/charms/focal/autopkgtest-web/webcontrol/helpers/tests.py
+++ b/charms/focal/autopkgtest-web/webcontrol/helpers/tests.py
@@ -19,6 +19,7 @@ def populate_dummy_db(db_con):
         (7, supported_releases[2], "arm64", "hello2"),
         (8, supported_releases[3], "amd64", "hello2"),
         (9, supported_releases[3], "arm64", "hello2"),
+        (10, supported_releases[0], "amd64", "vim"),
     ]
     c.executemany("INSERT INTO test values(?, ?, ?, ?)", tests)
     results = [
@@ -34,6 +35,7 @@ def populate_dummy_db(db_con):
         (7, datetime.now(), "2.0.0", "hello/1.2.3", 142, 16, "", "", str(uuid4())),
         (8, datetime.now(), "2.0.0", "hello/1.2.3", 142, 20, "", "", str(uuid4())),
         (9, datetime.now(), "2.0.0", "hello/1.2.3", 142, 0, "", "", str(uuid4())),
+        (10, datetime.now(), "2:9.1.0016-1", "vim/2:9.1.0016-1", 1142, 0, "", "", str(uuid4())),
         # fmt: on
     ]
     c.executemany(
diff --git a/charms/focal/autopkgtest-web/webcontrol/static/launchpad.ico b/charms/focal/autopkgtest-web/webcontrol/static/launchpad.ico
 new file mode 100644
index 0000000..8c4c834
 Binary files /dev/null and b/charms/focal/autopkgtest-web/webcontrol/static/launchpad.ico differ
diff --git a/charms/focal/autopkgtest-web/webcontrol/templates/browse-package.html b/charms/focal/autopkgtest-web/webcontrol/templates/browse-package.html
index 65d14de..ea59f0f 100644
--- a/charms/focal/autopkgtest-web/webcontrol/templates/browse-package.html
+++ b/charms/focal/autopkgtest-web/webcontrol/templates/browse-package.html
@@ -3,6 +3,9 @@
 
 {% block content %}
   <h2>{{package}}</h2>
+  {{ macros.launchpad_link(package) }}
+  |
+  {{ macros.excuses_link(package) }}
 
   <table class="table" style='width: auto'>
     <tr>
diff --git a/charms/focal/autopkgtest-web/webcontrol/templates/browse-results.html b/charms/focal/autopkgtest-web/webcontrol/templates/browse-results.html
index fd2332a..fd300f7 100644
--- a/charms/focal/autopkgtest-web/webcontrol/templates/browse-results.html
+++ b/charms/focal/autopkgtest-web/webcontrol/templates/browse-results.html
@@ -1,6 +1,11 @@
 {% extends "browse-layout.html" %}
+{% import "macros.html" as macros %}
+
 {% block content %}
   <h2><a href="{{base_url}}packages/{{package}}">{{package}}</a> <small>[{{release}}/{{arch}}]</small></h2>
+  {{ macros.launchpad_link(package, release) }}
+  |
+  {{ macros.excuses_link(package, release) }}
 
   <table class="table">
     <tr>
diff --git a/charms/focal/autopkgtest-web/webcontrol/templates/macros.html b/charms/focal/autopkgtest-web/webcontrol/templates/macros.html
index 77400c8..8995301 100644
--- a/charms/focal/autopkgtest-web/webcontrol/templates/macros.html
+++ b/charms/focal/autopkgtest-web/webcontrol/templates/macros.html
@@ -48,3 +48,17 @@
     {%- endfor %}
   {%- endfor %}
 {%- endmacro %}
+
+{% macro excuses_link(package_name, release="") -%}
+{% if release != "" %}
+{% set release = release + "/" %}
+{% endif %}
+<a href="https://ubuntu-archive-team.ubuntu.com/proposed-migration/{{ release }}update_excuses.html#{{ package_name }}">excuses</a>
+{%- endmacro %}
+
+{% macro launchpad_link(package_name, release="") -%}
+{% if release != "" %}
+{% set release = release + "/" %}
+{% endif %}
+<a href="https://launchpad.net/ubuntu/{{ release }}+source/{{ package_name }}"><img src="{{ url_for('static', filename='launchpad.ico') }}" style="height: 1em;">Launchpad</a>
+{%- endmacro %}