builds: Move job queue

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

diff --git a/Makefile.am b/Makefile.am
index 2c8b0c23bfe0e6848b5b01d401960ead581a7c91..1b0031c75371b7302bd81f2cf4035962c096ab55 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -186,7 +186,6 @@ dist_templates_builds_DATA = \
        src/templates/builds/clone.html \
        src/templates/builds/delete.html \
        src/templates/builds/index.html \
-       src/templates/builds/queue.html \
        src/templates/builds/show.html
 
 templates_buildsdir = $(templatesdir)/builds
@@ -278,6 +277,7 @@ dist_templates_jobs_DATA = \
        src/templates/jobs/abort.html \
        src/templates/jobs/index.html \
        src/templates/jobs/log-stream.html \
+       src/templates/jobs/queue.html \
        src/templates/jobs/retry.html
 
 templates_jobsdir = $(templatesdir)/jobs

diff --git a/src/templates/base.html b/src/templates/base.html
index c4b6cb6c540256d8b9e800b2673062952a676122..58ea84c03d92b6cc8e08f874d136ddda89a59a1c 100644 (file)
--- a/src/templates/base.html
+++ b/src/templates/base.html
@@ -65,8 +65,8 @@
                                                                                {{ _("Users") }}
                                                                        </a>
                                                                {% end %}
-                                                               <a class="navbar-item" href="/builds/queue">
-                                                                       {{ _("Build Queue") }}
+                                                               <a class="navbar-item" href="/jobs/queue">
+                                                                       {{ _("Job Queue") }}
                                                                </a>
                                                                <a class="navbar-item" href="/log">
                                                                        {{ _("Log") }}

diff --git a/src/templates/index.html b/src/templates/index.html
index b59a12758c427354832dc68531b713bafdde0c28..2755dc685b3f7d0c9a371ebf70a0ca05dcfc3104 100644 (file)
--- a/src/templates/index.html
+++ b/src/templates/index.html
@@ -38,7 +38,7 @@
                                                                <div>
                                                                        <p class="heading">{{ _("Queued Jobs") }}</p>
                                                                        <p class="title">
-                                                                               <a href="/builds/queue">
+                                                                               <a href="/jobs/queue">
                                                                                        {{ queue_length }}
                                                                                </a>
                                                                        </p>

diff --git a/src/templates/builds/queue.html b/src/templates/jobs/queue.html
similarity index 77%
rename from src/templates/builds/queue.html
rename to src/templates/jobs/queue.html
index 06d271acf96b75982e4d18d20eeecd81a57ed360..94eea4fc93f3167233196ca7f5c3ac89fa520ebf 100644 (file)
--- a/src/templates/builds/queue.html
+++ b/src/templates/jobs/queue.html
@@ -1,6 +1,6 @@
 {% extends "../base.html" %}
 
-{% block title %}{{ _("Build Queue") }}{% end block %}
+{% block title %}{{ _("Job Queue") }}{% end block %}
 
 {% block body %}
        <section class="hero is-light">
@@ -9,7 +9,7 @@
                                <nav class="breadcrumb" aria-label="breadcrumbs">
                                        <ul>
                                                <li>
-                                                       <a href="/builds">{{ _("Builds") }}</a>
+                                                       <a href="/jobs">{{ _("Jobs") }}</a>
                                                </li>
                                                <li class="is-active">
                                                        <a href="#" aria-current="page">
@@ -19,7 +19,7 @@
                                        </ul>
                                </nav>
 
-                               <h1 class="title">{{ _("Build Queue") }}</h1>
+                               <h1 class="title">{{ _("Job Queue") }}</h1>
                        </div>
                </div>
        </section>

diff --git a/src/web/__init__.py b/src/web/__init__.py
index 8f4c242610ba26c323ca819d8e38db7e8681382b..d92ffe72c6c1fb7fe4c6a342f7fff99cbd13b02c 100644 (file)
--- a/src/web/__init__.py
+++ b/src/web/__init__.py
@@ -156,7 +156,6 @@ class Application(tornado.web.Application):
 
                        # Builds
                        (r"/builds", builds.IndexHandler),
-                       (r"/builds/queue", builds.QueueHandler),
                        (r"/builds/([\w]{8}-[\w]{4}-[\w]{4}-[\w]{4}-[\w]{12})", builds.ShowHandler),
                        (r"/builds/([\w]{8}-[\w]{4}-[\w]{4}-[\w]{4}-[\w]{12})/bug", builds.BugHandler),
                        (r"/builds/([\w]{8}-[\w]{4}-[\w]{4}-[\w]{4}-[\w]{12})/clone", builds.CloneHandler),
@@ -174,6 +173,7 @@ class Application(tornado.web.Application):
 
                        # Jobs
                        (r"/jobs", jobs.IndexHandler),
+                       (r"/jobs/queue", jobs.QueueHandler),
                        (r"/jobs/([\w]{8}-[\w]{4}-[\w]{4}-[\w]{4}-[\w]{12})/abort", jobs.AbortHandler),
                        (r"/jobs/([\w]{8}-[\w]{4}-[\w]{4}-[\w]{4}-[\w]{12})/log", jobs.LogHandler),
                        (r"/jobs/([\w]{8}-[\w]{4}-[\w]{4}-[\w]{4}-[\w]{12})/retry", jobs.RetryHandler),

diff --git a/src/web/builds.py b/src/web/builds.py
index 8fc15bba29821249e671d1c38ef25843c5be1b23..7dc8bbaad2f6e7f0b374da89e9c774dbfe734d67 100644 (file)
--- a/src/web/builds.py
+++ b/src/web/builds.py
@@ -84,11 +84,6 @@ class IndexHandler(base.BaseHandler):
                        limit=limit, offset=offset)
 
 
-class QueueHandler(base.BaseHandler):
-       def get(self):
-               self.render("builds/queue.html", queue=self.backend.jobs.queue)
-
-
 class ShowHandler(base.BaseHandler):
        async def get(self, uuid):
                build = self.backend.builds.get_by_uuid(uuid)

diff --git a/src/web/jobs.py b/src/web/jobs.py
index 4556b77169554bd00c25003242c2b705a515bf94..813532abab722a3e9d3a7667be96c7bd72b6721a 100644 (file)
--- a/src/web/jobs.py
+++ b/src/web/jobs.py
@@ -160,6 +160,11 @@ class IndexHandler(base.BaseHandler):
                        failed_only=failed_only)
 
 
+class QueueHandler(base.BaseHandler):
+       def get(self):
+               self.render("jobs/queue.html", queue=self.backend.jobs.queue)
+
+
 class LogHandler(base.BaseHandler):
        async def get(self, uuid):
                job = self.backend.jobs.get_by_uuid(uuid)