From d38759cc26a5f1c0d71962a22921134d1e7d5c75 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Fri, 31 Jan 2020 07:41:58 +0100 Subject: [PATCH] Dashboard: link the product package --- dashboard/generate.py | 24 +++++++++++++----------- dashboard/templates/dashboard.html | 14 ++++++++++++-- 2 files changed, 25 insertions(+), 13 deletions(-) diff --git a/dashboard/generate.py b/dashboard/generate.py index 46c0efa7..1133509d 100644 --- a/dashboard/generate.py +++ b/dashboard/generate.py @@ -37,9 +37,9 @@ class Fetcher(object): amqp_prefix = 'opensuse' openqa_url = 'https://openqa.opensuse.org' - def add(self, name, nick): + def add(self, name, **kwargs): # cyclic dependency! - self.projects.append(Project(self, name, nick)) + self.projects.append(Project(self, name, kwargs)) def build_summary(self, project, repository): url = makeurl(self.apiurl, ['build', project, '_result'], { 'repository': repository, 'view': 'summary' }) @@ -93,10 +93,11 @@ class Fetcher(object): return attribute_value_load(self.apiurl, project, 'ProductVersion') class Project(object): - def __init__(self, fetcher, name, nick): + def __init__(self, fetcher, name, kwargs): self.fetcher = fetcher self.name = name - self.nick = nick + self.nick = kwargs.get('nick') + self.download_url = kwargs.get('download_url') self.all_archs = fetcher.generate_all_archs(name) self.ttm_status = fetcher.fetch_ttm_status(name) self.ttm_version = fetcher.fetch_product_version(name) @@ -134,13 +135,14 @@ if __name__ == '__main__': app = Flask(__name__) - fetcher.add('openSUSE:Factory', 'Factory') - fetcher.add('openSUSE:Factory:Rings:0-Bootstrap', 'Ring 0') - fetcher.add('openSUSE:Factory:Rings:1-MinimalX', 'Ring 1') - fetcher.add('openSUSE:Factory:ARM', 'ARM') - fetcher.add('openSUSE:Factory:PowerPC', 'Power') - fetcher.add('openSUSE:Factory:zSystems', 'System Z') - fetcher.add('openSUSE:Factory:RISCV', 'Risc V') + fetcher.add('openSUSE:Factory', nick='Factory', download_url='https://download.opensuse.org/tumbleweed/iso/') + fetcher.add('openSUSE:Factory:Live', nick='Live') + fetcher.add('openSUSE:Factory:Rings:0-Bootstrap', nick='Ring 0') + fetcher.add('openSUSE:Factory:Rings:1-MinimalX', nick='Ring 1') + fetcher.add('openSUSE:Factory:ARM', nick='ARM', download_url='http://download.opensuse.org/ports/aarch64/tumbleweed/iso/') + fetcher.add('openSUSE:Factory:PowerPC', nick='Power', download_url='http://download.opensuse.org/ports/ppc/tumbleweed/iso/') + fetcher.add('openSUSE:Factory:zSystems', nick='System Z', download_url='http://download.opensuse.org/ports/zsystems/tumbleweed/iso/') + fetcher.add('openSUSE:Factory:RISCV', nick='Risc V', download_url='http://download.opensuse.org/ports/riscv/tumbleweed/iso/') with app.app_context(): rendered = render_template('dashboard.html', diff --git a/dashboard/templates/dashboard.html b/dashboard/templates/dashboard.html index 053b3a30..b92b1a1f 100644 --- a/dashboard/templates/dashboard.html +++ b/dashboard/templates/dashboard.html @@ -4,6 +4,7 @@ + @@ -63,13 +64,22 @@ {% endif %} - {{ project.ttm_version or 'n.a.' }} + {% if project.ttm_version %} + {{ project.ttm_version }} + {% else %} + n.a. + {% endif %} {{ project.ttm_status.get('testing', 'n.a.') }} - {{ project.ttm_status.get('published', 'n.a.') }} + {% set ttm_published = project.ttm_status.get('published', None) %} + {% if ttm_published %} + {{ ttm_published }} + {% else %} + n.a. + {% endif %} {% endfor %}