builders: Include disabled builders in autoscale

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

diff --git a/src/buildservice/builders.py b/src/buildservice/builders.py
index 753e34198a868201464bda26c60988cbd583662c..788b4c50d0200464a4bf35e274fb73ad4f066108 100644 (file)
--- a/src/buildservice/builders.py
+++ b/src/buildservice/builders.py
@@ -116,8 +116,8 @@ class Builders(base.Object):
                # XXX max queue length
                threshold = datetime.timedelta(minutes=5)
 
-               # Fetch all enabled builders
-               builders = [b for b in self if b.enabled]
+               # Fetch all builders
+               builders = [b for b in self]
 
                # Fetch the priority for each builder
                builders = dict(
@@ -728,6 +728,10 @@ class Builder(base.DataObject):
                if not self.instance:
                        return 0
 
+               # Move disabled builders towards the end
+               if not self.enabled:
+                       return -1
+
                # Running builders should come first
                if await self.is_running():
                        return 1