[zorg] r238525 - Added on_demand_builders group for builders. Experimental builders renamed to experimental_scheduled.

[Galina Kistanova]

Author: gkistanova
Date: Thu May 28 18:21:28 2015
New Revision: 238525

URL: http://llvm.org/viewvc/llvm-project?rev=238525&view=rev
Log:
Added on_demand_builders group for builders. Experimental builders renamed to experimental_scheduled.
Both groups of builders will not send email and IRC notifications.

Modified:
    zorg/trunk/buildbot/osuosl/master/config/builders.py
    zorg/trunk/buildbot/osuosl/master/master.cfg

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=238525&r1=238524&r2=238525&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Thu May 28 18:21:28 2015
@@ -313,14 +313,6 @@ def _get_clang_builders():
                                         "-DCMAKE_CXX_FLAGS='-mcpu=cortex-a15 -mfpu=vfpv3'",
                                         "-DLLVM_TARGETS_TO_BUILD='ARM;AArch64'"])},
 
-        {'name': "clang-native-mingw32-win7",
-         'slavenames':["as-bldslv7"],
-         'builddir':"clang-native-mingw32-win7",
-         'factory' : ClangBuilder.getClangBuildFactory(triple='i686-pc-mingw32',
-                                                       useTwoStage=True, test=False,
-                                                       stage1_config='Release+Asserts',
-                                                       stage2_config='Release+Asserts')},
-
         # This will ultimately be a self-host bot, even though the config does
         # not reflect that today.
         {'name': 'clang-x86-win2008-selfhost',
@@ -963,7 +955,19 @@ def _get_libcxx_builders():
 
 
 # Experimental and stopped builders
-def _get_experimental_builders():
+def _get_on_demand_builders():
+    return [
+        {'name': "clang-native-mingw32-win7",
+         'slavenames':["as-bldslv7"],
+         'builddir':"clang-native-mingw32-win7",
+         'category':'clang',
+         'factory' : ClangBuilder.getClangBuildFactory(triple='i686-pc-mingw32',
+                                                       useTwoStage=True, test=False,
+                                                       stage1_config='Release+Asserts',
+                                                       stage2_config='Release+Asserts')},
+        ]
+
+def _get_experimental_scheduled_builders():
     return [
         {'name': "llvm-ppc64-linux2",
          'slavenames':["coho"],
@@ -1111,11 +1115,16 @@ def get_builders():
     for b in _get_documentation_builders():
         yield b
 
-    for b in _get_experimental_builders():
+    for b in _get_experimental_scheduled_builders():
         if not b.get('category', '').endswith('.exp'):
            b['category'] = b.get('category', '') + '.exp'
         yield b
 
+    for b in _get_on_demand_builders():
+        if not b.get('category', '').endswith('.on-demand'):
+           b['category'] = b.get('category', '') + '.on-demand'
+        yield b
+
 # Random other unused builders...
 {'name': "clang-x86_64-openbsd",
  'slavenames':["ocean1"],

Modified: zorg/trunk/buildbot/osuosl/master/master.cfg
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/osuosl/master/master.cfg?rev=238525&r1=238524&r2=238525&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/master.cfg (original)
+++ zorg/trunk/buildbot/osuosl/master/master.cfg Thu May 28 18:21:28 2015
@@ -85,6 +85,7 @@ c['builders'] = builders = list(config.b
 # will keep track of such.
 standard_builders = [b['name'] for b in builders
                      if not b['category'].endswith('.exp') and
+                        not b['category'].endswith('.on-demand') and
                         # List of builders to keep quite
                         not b['name'].startswith('perf-x86_64') and
                         not b['name'] == 'sanitizer_x86_64-freebsd']
@@ -94,6 +95,7 @@ standard_builders = [b['name'] for b in
 # than requested.
 standard_categories = [b['category'] for b in builders
                        if not b['category'].endswith('.exp') and
+                          not b['category'].endswith('.on-demand') and
                           not b['name'].startswith('perf-x86_64')]
 
 c['status'] = config.status.get_status_targets(standard_builders,
@@ -111,15 +113,15 @@ def depends_on(projects):
     """
     return ChangeFilter(project=projects)
 
-def get_all_for(category):
+def get_standard_for(category):
     """
-    Returns a list of builder names for the given category.
+    Returns a list of standard builder names for the given category.
     """
     return [
         b['name'] for b in builders
             if b['category'] == category]
 
-def get_all_with_exp_for(category):
+def get_all_for(category):
     """
     Returns a list of builder names for the given category, including
     expiremental builders.
@@ -169,7 +171,7 @@ c['schedulers'].append(SingleBranchSched
 
 c['schedulers'].append(SingleBranchScheduler(name="lldb_scheduler",
                             treeStableTimer=2*60,
-                            builderNames=get_all_with_exp_for("lldb"),
+                            builderNames=get_all_for("lldb"),
                             change_filter=depends_on([
                                 "llvm",
                                 "cfe",