builds: Don't show test builds in listings

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

diff --git a/src/buildservice/builds.py b/src/buildservice/builds.py
index 3f687901078bd9971c46eff45c088a1a461b8ff1..16714f600c3d808327069788b2db77b09dc36053 100644 (file)
--- a/src/buildservice/builds.py
+++ b/src/buildservice/builds.py
@@ -36,6 +36,8 @@ class Builds(base.Object):
                                builds
                        WHERE
                                deleted_at IS NULL
+                       AND
+                               test IS FALSE
                        """,
                )
 
@@ -112,6 +114,8 @@ class Builds(base.Object):
                                packages ON builds.pkg_id = packages.id
                        WHERE
                                builds.deleted_at IS NULL
+                       AND
+                               builds.test IS FALSE
                        AND
                                packages.name = %s
                        ORDER BY
@@ -122,7 +126,7 @@ class Builds(base.Object):
 
        def get_recent(self, limit=None):
                """
-                       Returns the most recent builds
+                       Returns the most recent (non-test) builds
                """
                builds = self._get_builds("""
                        SELECT
@@ -131,6 +135,8 @@ class Builds(base.Object):
                                builds
                        WHERE
                                deleted_at IS NULL
+                       AND
+                               test IS FALSE
                        ORDER BY
                                created_at DESC
                        LIMIT %s""",
@@ -150,6 +156,8 @@ class Builds(base.Object):
                                builds
                        WHERE
                                deleted_at IS NULL
+                       AND
+                               test IS FALSE
                        AND
                                owner_id = %s
                        ORDER BY

diff --git a/src/buildservice/users.py b/src/buildservice/users.py
index 4fde892c11b5bd077f6cbd9e7e71fdf21b5b4770..40ca23901d311557efcdebb801f09f8fc12a5705 100644 (file)
--- a/src/buildservice/users.py
+++ b/src/buildservice/users.py
@@ -300,6 +300,8 @@ class Users(base.Object):
                                users
                        LEFT JOIN
                                builds ON users.id = builds.owner_id
+                       WHERE
+                               builds.test IS FALSE
                        GROUP BY
                                users.id
                        ORDER BY
@@ -526,6 +528,8 @@ class User(base.DataObject):
                        FROM
                                builds
                        WHERE
+                               test IS FALSE
+                       AND
                                owner_id = %s
                        """, self.id,
                )