Collapse clean and non clean build requests on clean builders

zorg/buildbot/builders/ClangBuilder.py

@@ -278,7 +278,8 @@ def _getClangCMakeBuildFactory(
     f = LLVMBuildFactory(
             depends_on_projects=depends_on_projects,
             llvm_srcdir='llvm',
-            enable_runtimes=enable_runtimes)
+            enable_runtimes=enable_runtimes,
+            clean=clean)
 
     # Checkout the latest code for LNT
     # and the test-suite separately. Le's do this first,

zorg/buildbot/process/buildrequest.py

@@ -31,6 +31,14 @@ def collapseRequests(master, builder, req1, req2):
             str(req2['buildsetid'])
         )
 
+    # If the build is going to be a clean build anyway, we can collapse a clean
+    # build and a non-clean build.
+    if getattr(builder.config.factory, "clean", False):
+        if 'clean_obj' in selfBuildsetPoperties:
+            del selfBuildsetPoperties["clean_obj"]
+        if 'clean_obj' in otherBuildsetPoperties:
+            del otherBuildsetPoperties["clean_obj"]
+
     # Check buildsets properties and do not collapse
     # if properties do not match. This includes the check
     # for different schedulers.

zorg/buildbot/process/factory.py

@@ -40,6 +40,8 @@ def __init__(self, steps=None, depends_on_projects=None, hint=None, **kwargs):
         BuildFactory.__init__(self, steps)
 
         self.hint = hint
+
+        self.clean = kwargs.pop('clean', False)
 
         # Handle the dependencies.
         if depends_on_projects is None: