From: Michael Tremer Date: Tue, 21 Jun 2022 10:41:04 +0000 (+0000) Subject: builds: Drop build time overview X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ee9e84cc59013e05372bbc238bd406a659e9f7ca;p=pbs.git builds: Drop build time overview Signed-off-by: Michael Tremer --- diff --git a/Makefile.am b/Makefile.am index e24f6ac5..d399823d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -316,8 +316,7 @@ dist_templates_packages_DATA = \ templates_packagesdir = $(templatesdir)/packages dist_templates_packages_builds_DATA = \ - src/templates/packages/builds/scratch.html \ - src/templates/packages/builds/times.html + src/templates/packages/builds/scratch.html templates_packages_buildsdir = $(templates_packagesdir)/builds diff --git a/src/buildservice/builds.py b/src/buildservice/builds.py index d8909acd..e431c176 100644 --- a/src/buildservice/builds.py +++ b/src/buildservice/builds.py @@ -293,50 +293,6 @@ class Builds(base.Object): return comments - def get_build_times_summary(self, name=None, arch=None): - query = "\ - SELECT \ - builds_times.arch AS arch, \ - MAX(duration) AS maximum, \ - MIN(duration) AS minimum, \ - AVG(duration) AS average, \ - SUM(duration) AS sum, \ - STDDEV_POP(duration) AS stddev \ - FROM builds_times \ - LEFT JOIN builds ON builds_times.build_id = builds.id \ - LEFT JOIN packages ON builds.pkg_id = packages.id" - - args = [] - conditions = [] - - # Filter for name. - if name: - conditions.append("packages.name = %s") - args.append(name) - - # Filter by arch. - if arch: - conditions.append("builds_times.arch = %s") - args.append(arch) - - # Add conditions. - if conditions: - query += " WHERE %s" % " AND ".join(conditions) - - # Grouping and sorting. - query += " GROUP BY builds_times.arch ORDER BY builds_times.arch DESC" - - return self.db.query(query, *args) - - def get_build_times_by_arch(self, arch, **kwargs): - kwargs.update({ - "arch" : arch, - }) - - build_times = self.get_build_times_summary(**kwargs) - if build_times: - return build_times[0] - class Build(base.DataObject): table = "builds" diff --git a/src/database.sql b/src/database.sql index 90ba1c0c..51a10afd 100644 --- a/src/database.sql +++ b/src/database.sql @@ -415,20 +415,6 @@ CREATE TABLE public.jobs ( ALTER TABLE public.jobs OWNER TO pakfire; --- --- Name: builds_times; Type: VIEW; Schema: public; Owner: pakfire --- - -CREATE VIEW public.builds_times AS - SELECT jobs.build_id, - jobs.arch, - date_part('epoch'::text, (jobs.time_finished - jobs.time_started)) AS duration - FROM public.jobs - WHERE ((jobs.test IS FALSE) AND (jobs.state = 'finished'::text)); - - -ALTER TABLE public.builds_times OWNER TO pakfire; - -- -- Name: builds_watchers; Type: TABLE; Schema: public; Owner: pakfire -- diff --git a/src/templates/packages/builds/times.html b/src/templates/packages/builds/times.html deleted file mode 100644 index a1f8a104..00000000 --- a/src/templates/packages/builds/times.html +++ /dev/null @@ -1,68 +0,0 @@ -{% extends "../../base.html" %} - -{% block title %}{{ _("Package build times") }}: {{ pkg.name }}{% end block %} - -{% block body %} - - -
-

- {{ pkg.name }}
- {{ pkg.summary }} -

-
- -

{{ _("Summary") }}

- -

- {{ _("This table shows you how long this package normally takes to be built.") }} -

- - - - - - - - - - - - - - - - - {% for row in build_times_summary %} - - - - - - - - {% end %} - -
{{ _("Build times") }}
{{ _("Architecture") }}{{ _("Average") }}{{ _("Maximum") }}{{ _("Minimum") }}{{ _("Total") }}
{{ row.arch }} - {{ format_time(row.average) }} - - ± {{ format_time(row.stddev / 2) }} - - {{ format_time(row.maximum) }}{{ format_time(row.minimum) }}{{ format_time(row.sum) }}
-{% end block %} diff --git a/src/web/__init__.py b/src/web/__init__.py index 7663b2e0..297c3aa8 100644 --- a/src/web/__init__.py +++ b/src/web/__init__.py @@ -121,7 +121,6 @@ class Application(tornado.web.Application): (r"/package/([\w]{8}-[\w]{4}-[\w]{4}-[\w]{4}-[\w]{12})/view(.*)", packages.PackageFileViewHandler), (r"/packages/([\w\-\+]+)", packages.PackageNameHandler), (r"/package/([\w\-\+]+)/builds/scratch", packages.PackageScratchBuildsHandler), - (r"/package/([\w\-\+]+)/builds/times", packages.PackageBuildsTimesHandler), (r"/package/([\w\-\+]+)/changelog", packages.PackageChangelogHandler), (r"/package/([\w\-\+]+)/properties", packages.PackagePropertiesHandler), diff --git a/src/web/packages.py b/src/web/packages.py index 0deb5009..38a1bdfc 100644 --- a/src/web/packages.py +++ b/src/web/packages.py @@ -230,18 +230,3 @@ class PackageFileViewHandler(PackageFileDownloadHandler): self.render("packages/view-file.html", pkg=pkg, filename=filename, mimetype=mimetype, content=content, filesize=f.size) - - -class PackageBuildsTimesHandler(base.BaseHandler): - def get(self, name): - latest_build = self.backend.builds.get_latest_by_name(name) - - # If no build with this name was found, we cannot go on. - if not latest_build: - raise tornado.web.HTTPError(404) - - # Get the summary stats. - build_times_summary = self.backend.builds.get_build_times_summary(name) - - self.render("packages/builds/times.html", pkg=latest_build.pkg, - build_times_summary=build_times_summary)