[zorg] r205724 - Added an openmp scheduler to zorg that triggers builds on commits to the openmp repository.

[Galina Kistanova]

Author: gkistanova
Date: Mon Apr  7 11:50:45 2014
New Revision: 205724

URL: http://llvm.org/viewvc/llvm-project?rev=205724&view=rev
Log:
Added an openmp scheduler to zorg that triggers builds on commits to the openmp repository.
Patch byDmitri Gribenko!

Modified:
    zorg/trunk/buildbot/llvmlab/master/config/schedulers.py
    zorg/trunk/buildbot/osuosl/master/config/builders.py
    zorg/trunk/buildbot/osuosl/master/master.cfg
    zorg/trunk/zorg/buildbot/changes/llvmpoller.py

Modified: zorg/trunk/buildbot/llvmlab/master/config/schedulers.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/llvmlab/master/config/schedulers.py?rev=205724&r1=205723&r2=205724&view=diff
==============================================================================
--- zorg/trunk/buildbot/llvmlab/master/config/schedulers.py (original)
+++ zorg/trunk/buildbot/llvmlab/master/config/schedulers.py Mon Apr  7 11:50:45 2014
@@ -53,6 +53,7 @@ def _tracked_projects(change):
 #                'lnt',
 #                'polly',
                 'test-suite',
+                'openmp',
     ]
     if change.category:
         return False

Modified: zorg/trunk/buildbot/osuosl/master/config/builders.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/osuosl/master/config/builders.py?rev=205724&r1=205723&r2=205724&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Mon Apr  7 11:50:45 2014
@@ -635,6 +635,26 @@ def _get_sanitizer_builders():
                                              env = { 'CC' : 'clang', 'CXX' : 'clang++'})},
           ]
 
+def _get_openmp_builders():
+    return [
+        {'name': "libiomp5-gcc-x86_64-linux-debian",
+         'slavenames':["gribozavr4"],
+         'builddir':"libiomp5-gcc-x86_64-linux-debian",
+         'factory' : Libiomp5Builder.getLibiomp5BuildFactory(
+                         buildcompiler="gcc",
+                         env={'PATH':'/home/llvmbb/bin/clang-latest/bin:/home/llvmbb/bin:/usr/local/bin:/usr/local/bin:/usr/bin:/bin'}),
+         'category' : 'libiomp5'},
+
+        {'name': "libiomp5-clang-x86_64-linux-debian",
+         'slavenames':["gribozavr4"],
+         'builddir':"libiomp5-clang-x86_64-linux-debian",
+         'factory' : Libiomp5Builder.getLibiomp5BuildFactory(
+                         buildcompiler="clang",
+                         env={'PATH':'/home/llvmbb/bin/clang-latest/bin:/home/llvmbb/bin:/usr/local/bin:/usr/local/bin:/usr/bin:/bin'}),
+         'category' : 'libiomp5'},
+        ]
+
+
 # Experimental and stopped builders
 def _get_experimental_builders():
     return [
@@ -655,18 +675,6 @@ def _get_experimental_builders():
          'builddir':"clang-openbsd",
          'factory' : ClangBuilder.getClangBuildFactory(stage1_config='Release+Asserts'),
          'category' : 'clang'},
-
-        {'name': "libiomp5-gcc-x86_64-linux-debian",
-         'slavenames':["gribozavr4"],
-         'builddir':"libiomp5-gcc-x86_64-linux-debian",
-         'factory' : Libiomp5Builder.getLibiomp5BuildFactory(buildcompiler="gcc"),
-         'category' : 'libiomp5'},
-
-        {'name': "libiomp5-clang-x86_64-linux-debian",
-         'slavenames':["gribozavr4"],
-         'builddir':"libiomp5-clang-x86_64-linux-debian",
-         'factory' : Libiomp5Builder.getLibiomp5BuildFactory(buildcompiler="clang"),
-         'category' : 'libiomp5'},
         ]
 
 def get_builders():
@@ -698,6 +706,10 @@ def get_builders():
         b['category'] = 'sanitizer'
         yield b
 
+    for b in _get_openmp_builders():
+        b['category'] = 'openmp'
+        yield b
+
     for b in _get_experimental_builders():
         yield b
 

Modified: zorg/trunk/buildbot/osuosl/master/master.cfg
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/osuosl/master/master.cfg?rev=205724&r1=205723&r2=205724&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/master.cfg (original)
+++ zorg/trunk/buildbot/osuosl/master/master.cfg Mon Apr  7 11:50:45 2014
@@ -46,7 +46,8 @@ c['change_source'].append(LLVMPoller(pro
     "compiler-rt",
     "dragonegg",
     "lld",
-    "lldb"]))
+    "lldb",
+    "openmp"]))
 
 #  c['change_source'].append(LLVMPoller("test-suite", "trunk"))
 
@@ -169,6 +170,12 @@ c['schedulers'].append(SingleBranchSched
                                 "cfe",
                                 "compiler-rt"])))
 
+c['schedulers'].append(SingleBranchScheduler(name="openmp_scheduler",
+                            treeStableTimer=2*60,
+                            builderNames=get_all_for("openmp"),
+                            change_filter=depends_on([
+                                "openmp"])))
+
 ####### PROJECT IDENTITY
 
 c['title'] = "LLVM"

Modified: zorg/trunk/zorg/buildbot/changes/llvmpoller.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/changes/llvmpoller.py?rev=205724&r1=205723&r2=205724&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/changes/llvmpoller.py (original)
+++ zorg/trunk/zorg/buildbot/changes/llvmpoller.py Mon Apr  7 11:50:45 2014
@@ -236,7 +236,8 @@ class LLVMPoller(base.PollingChangeSourc
             'llvm-gcc-4.2' : 'llvm-gcc',
             'compiler-rt'  : 'compiler-rt',
             'dragonegg'    : 'dragonegg',
-            'lldb'         : 'lldb'
+            'lldb'         : 'lldb',
+            'openmp'       : 'openmp',
             }
 
         for el in new_logentries: