]> git.ipfire.org Git - pbs.git/commitdiff
builds: Drop separating between test and regular jobs
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 3 May 2023 09:50:32 +0000 (09:50 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 3 May 2023 09:50:32 +0000 (09:50 +0000)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
src/buildservice/builds.py

index c7a9d03cbf15adcb2699e59aa827b0a3d630b8a9..f6121c165c7d3bedcfa844361921c8bac5c8f058 100644 (file)
@@ -302,7 +302,7 @@ class Build(base.DataObject):
                """
                # Delete all jobs
                await asyncio.gather(
-                       *(job.delete(user=user) for job in self.jobs + self.test_jobs),
+                       *(job.delete(user=user) for job in self._jobs),
                )
 
                # Mark as deleted
@@ -467,12 +467,7 @@ class Build(base.DataObject):
                        Get a list of all build jobs that are in this build.
                """
                return self._get_jobs("SELECT * FROM jobs \
-                       WHERE build_id = %s AND test IS FALSE", self.id)
-
-       @property
-       def test_jobs(self):
-               return self._get_jobs("SELECT * FROM jobs \
-                       WHERE build_id = %s AND test IS TRUE", self.id)
+                       WHERE build_id = %s", self.id)
 
        def _create_jobs(self):
                """