From: Michael Tremer Date: Thu, 19 Oct 2023 10:34:08 +0000 (+0000) Subject: jobs: Fix quota calculation for release builds X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb1a2378eba2f80de70d64bdd6cc3447438cf3e3;p=pbs.git jobs: Fix quota calculation for release builds Signed-off-by: Michael Tremer --- diff --git a/src/buildservice/jobs.py b/src/buildservice/jobs.py index 6ccb2f3e..b2bb6581 100644 --- a/src/buildservice/jobs.py +++ b/src/buildservice/jobs.py @@ -58,9 +58,14 @@ WITH_JOB_QUEUE_CTE = """ jobs.finished_at IS NULL AND jobs.installcheck_succeeded IS TRUE + -- Remove any jobs from users that have exceeded their quota AND - NOT builds.owner_id IN (SELECT user_id FROM users_with_exceeded_quotas) + ( + builds.owner_id IS NULL + OR + NOT builds.owner_id IN (SELECT user_id FROM users_with_exceeded_quotas) + ) ORDER BY _rank )