builders: Do not consider deleted builds as running

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

diff --git a/src/buildservice/builders.py b/src/buildservice/builders.py
index 1718ebeae4c388bdef5bde9c4c669404d75138e8..15dc856a1916d4ac0f16e9f1b68e94ce12ca93c3 100644 (file)
--- a/src/buildservice/builders.py
+++ b/src/buildservice/builders.py
@@ -383,6 +383,8 @@ class Builder(base.DataObject):
                        FROM
                                jobs
                        WHERE
+                               deleted_at IS NULL
+                       AND
                                started_at IS NOT NULL
                        AND
                                finished_at IS NULL

diff --git a/src/buildservice/jobs.py b/src/buildservice/jobs.py
index 054e70d00ae9470b6fbde37968da5bb2543d07b1..c49e522e2376a0046a9d5bdcb41bcda0181e1cca 100644 (file)
--- a/src/buildservice/jobs.py
+++ b/src/buildservice/jobs.py
@@ -77,11 +77,13 @@ class Jobs(base.Object):
                        FROM
                                jobs
                        WHERE
+                               deleted_at IS NULL
+                       AND
                                started_at IS NOT NULL
                        AND
                                finished_at IS NULL
                        ORDER BY
-                               finished_at
+                               started_at DESC
                """)
 
                return list(jobs)