[zorg] r180798 - Moved two alive builders from the end of line to their previous place.

[Galina Kistanova]

Author: gkistanova
Date: Tue Apr 30 14:36:07 2013
New Revision: 180798

URL: http://llvm.org/viewvc/llvm-project?rev=180798&view=rev
Log:
Moved two alive builders from the end of line to their previous place.
Reduced number of jobs for openbsd-buildslave slave and rename its builder to 'clang-amd64-openbsd'.

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

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=180798&r1=180797&r2=180798&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Tue Apr 30 14:36:07 2013
@@ -51,6 +51,10 @@ def _get_llvm_builders():
          'slavenames': ["gcc14"],
          'builddir': "llvm-x86_64",
          'factory': LLVMBuilder.getLLVMBuildFactory(triple="x86_64-pc-linux-gnu")},
+        {'name': "llvm-x86_64-ubuntu",
+         'slavenames':["arxan_davinci"],
+         'builddir':"llvm-x86_64-ubuntu",
+         'factory': LLVMBuilder.getLLVMBuildFactory("x86_64-pc-linux-gnu", jobs=4)},
         {'name': "llvm-armv5-linux",
          'slavenames':["ranby1"],
          'builddir':"llvm-armv5-linux",
@@ -190,6 +194,11 @@ def _get_clang_builders():
          'builddir':"clang-atom-d2700-ubuntu-rel",
          'factory' : ClangBuilder.getClangBuildFactory(stage1_config='Release+Asserts')},
 
+        {'name': "clang-x86_64-ubuntu",
+         'slavenames':["arxan_raphael"],
+         'builddir':"clang-x86_64-ubuntu",
+         'factory' : ClangBuilder.getClangBuildFactory()},
+
         {'name': "clang-native-arm-cortex-a9",
          'slavenames':["as-bldslv1", "as-bldslv2", "as-bldslv3", "linaro-panda-01"],
          'builddir':"clang-native-arm-cortex-a9",
@@ -593,12 +602,6 @@ def _get_experimental_builders():
                                                     config_name='Release+Asserts',
                                                     extra_configure_args=["--enable-werror"]),
          'category' : 'llvm'},
-        {'name': "llvm-x86_64-ubuntu",
-         'slavenames':["arxan_davinci"],
-         'builddir':"llvm-x86_64-ubuntu",
-         'factory': LLVMBuilder.getLLVMBuildFactory("x86_64-pc-linux-gnu", jobs=4),
-         'category' : 'llvm'},
-
         {'name': "clang-x86_64-debian-debug-werror",
          'slavenames':["obbligato-ellington"],
          'builddir':"clang-x86-64-debian-debug-werror",
@@ -617,13 +620,7 @@ def _get_experimental_builders():
                                                      stage2_config='Release+Asserts',
                                                      extra_configure_args=["--enable-werror"]),
          'category' : 'clang'},
-        {'name': "clang-x86_64-ubuntu",
-         'slavenames':["arxan_raphael"],
-         'builddir':"clang-x86_64-ubuntu",
-         'factory' : ClangBuilder.getClangBuildFactory(),
-         'category' : 'clang'},
-
-        {'name': "clang-openbsd",
+        {'name': "clang-amd64-openbsd",
          'slavenames':["openbsd-buildslave"],
          'builddir':"clang-openbsd",
          'factory' : ClangBuilder.getClangBuildFactory(stage1_config='Release+Asserts'),

Modified: zorg/trunk/buildbot/osuosl/master/config/slaves.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/osuosl/master/config/slaves.py?rev=180798&r1=180797&r2=180798&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/slaves.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/slaves.py Tue Apr 30 14:36:07 2013
@@ -191,7 +191,7 @@ def get_build_slaves():
         create_slave("obbligato-ellington", properties={'jobs': 2}, max_builds=1),
 
         # OpenBSD
-        create_slave("openbsd-buildslave", properties={'jobs': 2}, max_builds=1),
+        create_slave("openbsd-buildslave", properties={'jobs': 1}, max_builds=1),
 
         # Defunct.
         # Pentium Dual CPU T3400 @ 2.1GHz