From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 9 Mar 2023 23:41:31 +0000 (+0000)
Subject: builders: Do not consider deleted builds as running
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da5adc3aca83fac70f4d52e3e65b19946b1c180a;p=pbs.git

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 1718ebea..15dc856a 100644
--- 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 054e70d0..c49e522e 100644
--- 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)