From 32b2613caaa2809ed72ac2282e80a86fda40e61e Mon Sep 17 00:00:00 2001 From: Tomas Hrnciar Date: Sep 10 2019 11:26:47 +0000 Subject: frontend: add link to builder-live log for chroot states Fixes: #951 --- diff --git a/frontend/coprs_frontend/coprs/models.py b/frontend/coprs_frontend/coprs/models.py index ce8c61f..9f89fc7 100644 --- a/frontend/coprs_frontend/coprs/models.py +++ b/frontend/coprs_frontend/coprs/models.py @@ -911,6 +911,14 @@ class Build(db.Model, helpers.Serializer): path = os.path.normpath(os.path.join(*parts)) return urljoin(app.config["BACKEND_BASE_URL"], path) + def backend_live_log(self, chroot): + parts = ["results", self.copr.owner_name, self.copr_dirname, + chroot.name, self.id_fixed_width + "-" + self.package.name, + "builder-live.log" if chroot.status == StatusEnum("running") + else "builder-live.log.gz"] + path = os.path.normpath(os.path.join(*parts)) + return urljoin(app.config["BACKEND_BASE_URL"], path) + @property def source_json_dict(self): if not self.source_json: diff --git a/frontend/coprs_frontend/coprs/templates/coprs/detail/build.html b/frontend/coprs_frontend/coprs/templates/coprs/detail/build.html index dfdeac9..9cfc41d 100644 --- a/frontend/coprs_frontend/coprs/templates/coprs/detail/build.html +++ b/frontend/coprs_frontend/coprs/templates/coprs/detail/build.html @@ -228,7 +228,11 @@ {{ chroot.started_on|time_ago(chroot.ended_on) }} - {{ build_state_text(chroot.state) }} + {% if chroot.finished or chroot.state == "running" %} + {{ build_state_text(chroot.state) }} + {% else %} + {{ build_state_text(chroot.state) }} + {% endif %} {% endfor %}