Merge remote-tracking branch 'origin/main' into 2024q4-gha-use-local-…

…testing-mode-for-checkconfig
llvm · Nov 13, 2024 · 5f603de · 5f603de
2 parents 64ddf00 + 41d1078
commit 5f603de
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 5 deletions.
diff --git a/buildbot/osuosl/master/config/builders.py b/buildbot/osuosl/master/config/builders.py
@@ -1694,7 +1694,9 @@
     'builddir': "sanitizer-windows",
     'factory' : AnnotatedBuilder.getAnnotatedBuildFactory(
                     script="sanitizer-windows.py",
-                    depends_on_projects=["llvm", "clang", "lld", "compiler-rt"])},
+                    depends_on_projects=["llvm", "clang", "lld", "compiler-rt"],
+                    # FIXME: Restore `timeout` to default when fixed https://github.com/llvm/llvm-project/issues/102513
+                    timeout=2400)},
 
 # OpenMP builders.
 
@@ -1948,7 +1950,7 @@
     'factory' : OpenMPBuilder.getOpenMPCMakeBuildFactory(
                         clean=True,
                         enable_runtimes=['compiler-rt', 'openmp', 'offload'],
-                        depends_on_projects=['llvm','clang','lld', 'offload', 'openmp','flang', 'compiler-rt'],
+                        depends_on_projects=['llvm','clang','lld', 'offload', 'openmp', 'mlir', 'flang', 'compiler-rt'],
                         extraCmakeArgs=[
                             "-DCMAKE_BUILD_TYPE=Release",
                             "-DCLANG_DEFAULT_LINKER=lld",

diff --git a/zorg/buildbot/builders/ClangBuilder.py b/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,

diff --git a/zorg/buildbot/process/buildrequest.py b/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.

diff --git a/zorg/buildbot/process/factory.py b/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:

diff --git a/zorg/jenkins/jobs/jobs/lldb-cmake-matrix b/zorg/jenkins/jobs/jobs/lldb-cmake-matrix
@@ -211,7 +211,10 @@ pipeline {
                         ], extensions: [
                             [$class: 'CloneOption', timeout: 30,
                             timeout: 30]
-                        ]])
+                        ],
+                        changelog: false,
+                        poll: false
+                        ])
                     }
                 }
                 timeout(90) {
@@ -276,7 +279,10 @@ pipeline {
                         ], extensions: [
                             [$class: 'CloneOption', timeout: 30,
                             timeout: 30]
-                        ]])
+                        ],
+                        changelog: false,
+                        poll: false
+                        ])
                     }
                 }
                 timeout(90) {