YunoHost/tartiflette
1
0
Fork 0
mirror of https://github.com/YunoHost/tartiflette.git synced 2024-09-03 20:06:08 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix link to actual tests logs

Browse source
This commit is contained in:
Alexandre Aubin 2018-12-12 16:33:24 +00:00
parent 86ca1285f2
commit d0415b88bb
2 changed files with 11 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/models/appci.py
View file

@ -13,7 +13,7 @@ class AppCIBranch(db.Model):
branch = db.Column(db.String(64), nullable=False) branch = db.Column(db.String(64), nullable=False)
display_name = db.Column(db.String(64), unique=True, nullable=False) display_name = db.Column(db.String(64), unique=True, nullable=False)
url = db.Column(db.String(128), nullable=False) url = db.Column(db.String(128), nullable=False)
console_uri = db.Column(db.String(128), nullable=False) url_per_app = db.Column(db.String(128), nullable=False)
def __repr__(self): def __repr__(self):
return '<AppCIBranch %r>' % self.name return '<AppCIBranch %r>' % self.name
@ -24,17 +24,17 @@ class AppCIBranch(db.Model):
branch="stable", branch="stable",
display_name='Stable (x86)', display_name='Stable (x86)',
url='https://ci-apps.yunohost.org/ci/logs/list_level_stable.json', url='https://ci-apps.yunohost.org/ci/logs/list_level_stable.json',
console_uri='/job/{} ({})/lastBuild/consoleText') url_per_app='https://ci-apps.yunohost.org/ci/apps/{}/')
yield AppCIBranch(name='arm', yield AppCIBranch(name='arm',
arch="arm", arch="arm",
branch="stable", branch="stable",
display_name='Stable (ARM)', display_name='Stable (ARM)',
url='https://ci-apps-arm.yunohost.org/ci/logs/list_level_stable.json', url='https://ci-apps-arm.yunohost.org/ci/logs/list_level_stable.json',
console_uri='/job/{} ({}) (~ARM~)/lastBuild/consoleText') url_per_app='https://ci-apps-arm.yunohost.org/ci/apps/{}/')
def last_build_url(self, app): def last_build_url(self, app):
return self.url + self.console_uri.format(app.name, app.list.name.title()) return self.url_per_app.format(app.name)
def most_recent_tests_per_app(self): def most_recent_tests_per_app(self):

20
app/templates/appci_branch.html
View file

@ -76,25 +76,18 @@
</td> </td>
{% endfor %} {% endfor %}
<td class="ci-app-test-info px-0"> <td class="ci-app-test-info px-0">
{% if result.url == None %} {% if result.date == None %}
{% if result.date == None %} <span class="daysAgo" href="{{ branch.last_build_url(result.app) }}">???</span>
<span class="daysAgo">???</span> {% else %}
{% else %} <span class="daysAgo" timestamp="{{ result.date.timestamp() }}" href="{{ branch.last_build_url(result.app) }}"></span>
<span class="daysAgo" timestamp="{{ result.date.timestamp() }}"></span> {% endif %}
{% endif %}
{% else %}
{% if result.date == None %}
<span class="daysAgo" href="{{ result.url.replace("consoleText", "consoleFull") }}">???</span>
{% else %}
<span class="daysAgo" timestamp="{{ result.date.timestamp() }}" href="{{ result.url.replace("consoleText", "consoleFull") }}"></span>
{% endif %}
{% endif %}
{% if result.commit != result.app.master_commit %} {% if result.commit != result.app.master_commit %}
<span class="oi oi-clock text-warning" <span class="oi oi-clock text-warning"
aria-hidden="true" aria-hidden="true"
title="This test is outdated : a more recent commit exists in master than the one tested."></span> title="This test is outdated : a more recent commit exists in master than the one tested."></span>
{% endif %} {% endif %}
{% if result.app.public_commit != 'HEAD' and result.app.public_commit != result.app.master_commit %} {% if result.app.public_commit != 'HEAD' and result.app.public_commit != result.app.master_commit %}
<!--
{% if result.app.public_vs_master_time_diff > 60 %} {% if result.app.public_vs_master_time_diff > 60 %}
<span class="oi oi-warning text-danger" <span class="oi oi-warning text-danger"
{% else %} {% else %}
@ -102,6 +95,7 @@
{% endif %} {% endif %}
aria-hidden="true" aria-hidden="true"
title="Master commit is not up to date with {{ result.app.list.name }}.json !"></span> title="Master commit is not up to date with {{ result.app.list.name }}.json !"></span>
-->
{% endif %} {% endif %}
{% if result.app.testing_diff > 0 %} {% if result.app.testing_diff > 0 %}
<span class="oi oi-fork text-info" <span class="oi oi-fork text-info"