events: Add builders

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/buildservice/events.py b/src/buildservice/events.py
index 95f41d85f98c579b52325a769c0b59b601323bc5..3fed363a06bb1ccafb461fbde4ba2752e3574fe9 100644 (file)
--- a/src/buildservice/events.py
+++ b/src/buildservice/events.py
@@ -44,6 +44,7 @@ log = logging.getLogger("pbs.events")
 # job
 # user
 # by_user
+# builder
 # repository
 #
 EVENTS_VIEW = """
@@ -59,6 +60,7 @@ EVENTS_VIEW = """
                        NULL::integer AS job,
                        NULL::integer AS user,
                        builds.owner_id AS by_user,
+                       NULL::integer AS builder,
                        NULL::integer AS repository
                FROM
                        builds
@@ -84,6 +86,7 @@ EVENTS_VIEW = """
                        NULL AS job,
                        NULL AS user,
                        NULL AS by_user,
+                       NULL AS builder,
                        NULL AS repository
                FROM
                        builds
@@ -103,6 +106,7 @@ EVENTS_VIEW = """
                        NULL AS job,
                        NULL AS user,
                        builds.deleted_by AS by_user,
+                       NULL AS builder,
                        NULL AS repository
                FROM
                        builds
@@ -123,6 +127,7 @@ EVENTS_VIEW = """
                        NULL AS job,
                        NULL AS user,
                        builds.deprecated_by AS by_user,
+                       NULL AS builder,
                        NULL AS repository
                FROM
                        builds
@@ -144,6 +149,7 @@ EVENTS_VIEW = """
                        NULL AS job,
                        NULL AS user,
                        build_comments.user_id AS by_user,
+                       NULL AS builder,
                        NULL AS repository
                FROM
                        build_comments
@@ -163,6 +169,7 @@ EVENTS_VIEW = """
                        NULL AS job,
                        build_watchers.user_id AS user,
                        NULL AS by_user,
+                       NULL AS builder,
                        NULL AS repository
                FROM
                        build_watchers
@@ -180,6 +187,7 @@ EVENTS_VIEW = """
                        NULL AS job,
                        build_watchers.user_id AS user,
                        NULL AS by_user,
+                       NULL AS builder,
                        NULL AS repository
                FROM
                        build_watchers
@@ -199,6 +207,7 @@ EVENTS_VIEW = """
                        NULL AS job,
                        NULL AS user,
                        repository_builds.added_by AS by_user,
+                       NULL AS builder,
                        repository_builds.repo_id AS repository
                FROM
                        repository_builds
@@ -216,6 +225,7 @@ EVENTS_VIEW = """
                        NULL AS job,
                        NULL AS user,
                        repository_builds.removed_by AS by_user,
+                       NULL AS builder,
                        repository_builds.repo_id AS repository
                FROM
                        repository_builds
@@ -235,6 +245,7 @@ EVENTS_VIEW = """
                        jobs.id AS job,
                        NULL AS user,
                        NULL AS by_user,
+                       NULL AS builder,
                        NULL AS repository
                FROM
                        jobs
@@ -254,6 +265,7 @@ EVENTS_VIEW = """
                        jobs.id AS job,
                        NULL AS user,
                        NULL AS by_user,
+                       jobs.builder_id AS builder,
                        NULL AS repository
                FROM
                        jobs
@@ -279,6 +291,7 @@ EVENTS_VIEW = """
                        jobs.id AS job,
                        NULL AS user,
                        NULL AS by_user,
+                       jobs.builder_id AS builder,
                        NULL AS repository
                FROM
                        jobs
@@ -304,6 +317,7 @@ EVENTS_VIEW = """
                        jobs.id AS job,
                        NULL AS user,
                        jobs.aborted_by AS by_user,
+                       jobs.builder_id AS builder,
                        NULL AS repository
                FROM
                        jobs
@@ -325,6 +339,7 @@ EVENTS_VIEW = """
                        jobs.id AS job,
                        NULL AS user,
                        NULL AS by_user,
+                       jobs.builder_id AS builder,
                        NULL AS repository
                FROM
                        jobs
@@ -352,6 +367,9 @@ class Events(base.Object):
                        # Repositories
                        "repository" : self.backend.repos.get_by_id,
 
+                       # Builders
+                       "builder"       : self.backend.builders.get_by_id,
+
                        # Users
                        "user"    : self.backend.users.get_by_id,
                        "by_user" : self.backend.users.get_by_id,

diff --git a/src/templates/events/modules/system-message.html b/src/templates/events/modules/system-message.html
index bb32b1c7c9e3500c16ce89d18afeda9e3dd0b03e..b8caf89af9098ce1ca392218ff9552ca48df4066 100644 (file)
--- a/src/templates/events/modules/system-message.html
+++ b/src/templates/events/modules/system-message.html
@@ -92,6 +92,13 @@
                                                {{ _("by %s") % event.by_user }}
                                        </a>
                                {% end %}
+
+                               {# Builder #}
+                               {% if event.builder %}
+                                       <a class="level-item" href="/builders/{{ event.builder.hostname }}">
+                                               {{ event.builder }}
+                                       </a>
+                               {% end %}
                        </div>
                </nav>
        </div>