Skia has proposed merging ~hyask/autopkgtest-cloud:skia/package_link into
autopkgtest-cloud:master.
Requested reviews:
Canonical's Ubuntu QA (canonical-ubuntu-qa)
For more details, see:
https://code.launchpad.net/~hyask/autopkgtest-cloud/+git/autopkgtest-cloud/+merge/461440
--
Your team Canonical's Ubuntu QA is requested to review the proposed merge of
~hyask/autopkgtest-cloud:skia/package_link into autopkgtest-cloud:master.
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 %}
--
Mailing list: https://launchpad.net/~canonical-ubuntu-qa
Post to : canonical-ubuntu-qa@lists.launchpad.net
Unsubscribe : https://launchpad.net/~canonical-ubuntu-qa
More help : https://help.launchpad.net/ListHelp
