[zorg] r206926 - Moved hexagon-build-02 builders to hexagon-build-03 slave.

[Galina Kistanova]

Author: gkistanova
Date: Tue Apr 22 17:50:16 2014
New Revision: 206926

URL: http://llvm.org/viewvc/llvm-project?rev=206926&view=rev
Log:
Moved hexagon-build-02 builders to hexagon-build-03 slave.
Patch by Rick Foos!

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=206926&r1=206925&r2=206926&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Tue Apr 22 17:50:16 2014
@@ -81,7 +81,7 @@ def _get_llvm_builders():
                                                     outOfDir=True,
                                                     extra_configure_args=["--host=aarch64-linux-gnu"])},
         {'name': "llvm-hexagon-elf",
-         'slavenames':["hexagon-build-02"],
+         'slavenames':["hexagon-build-03"],
          'builddir':"llvm-hexagon-elf",
          'factory': LLVMBuilder.getLLVMBuildFactory("hexagon-unknown-elf", timeout=40, config_name='Release+Asserts',
                                                        extra_configure_args=['--build=x86_64-linux-gnu',
@@ -338,7 +338,7 @@ def _get_clang_builders():
          'factory' : ClangBuilder.getClangBuildFactory(stage1_config='Release+Asserts', run_modern_gdb=True, clean=False)},
 
         {'name' : "clang-hexagon-elf",
-         'slavenames' :["hexagon-build-02"],
+         'slavenames' :["hexagon-build-03"],
          'builddir' :"clang-hexagon-elf",
          'factory' : ClangBuilder.getClangBuildFactory(
                      triple='x86_64-linux-gnu',
@@ -593,13 +593,12 @@ def _get_sanitizer_builders():
            'builddir': "sanitizer-x86_64-linux-bootstrap",
            'factory': SanitizerBuilder.getSanitizerBuildFactory()},
 
-          # hexagon-build-03: /opt/usr/bin contains clang-3.4 for sanitizer.
-          {'name': "llvm-clang-lld-x86_64-ubuntu-13.04-sanitize-address",
-           'slavenames':["hexagon-build-03"],
-           'builddir':"llvm-clang-lld-x86_64-ubuntu-13.04-fsanitize-address",
-           'factory': ClangAndLLDBuilder.getClangAndLLDBuildFactory(
-                                             buildWithSanitizerOptions=['-fsanitize=address'],
-                                             env={'PATH':'/opt/usr/bin:/usr/local/bin:/usr/bin:/bin'})},
+          #{'name': "llvm-clang-lld-x86_64-ubuntu-sanitize-address",
+          # 'slavenames':["hexagon-build-03"],
+          # 'builddir':"llvm-clang-lld-x86_64-ubuntu-sanitize-address",
+          # 'factory': ClangAndLLDBuilder.getClangAndLLDBuildFactory(
+          #                                   buildWithSanitizerOptions=['-fsanitize=address'],
+          #                                   env={'PATH':'/usr/local/bin:/usr/bin:/bin'})},
 
           {'name': "sanitizer_x86_64-freeBSD9.2",
            'slavenames':["as-bldslv8"],

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=206926&r1=206925&r2=206926&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/slaves.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/slaves.py Tue Apr 22 17:50:16 2014
@@ -115,7 +115,7 @@ def get_build_slaves():
         # Ubuntu x86-64, Intel(R) Xeon(R) CPU E5-2680 0 @ 2.70GHz
         create_slave("hexagon-build-03", properties={'jobs': 16, 'loadaverage':
 32},
-            max_builds=2),
+            max_builds=4),
 
         # Cavium Octeon II V0.8, MIPS64 big endian, Debian squeeze (6.0.6)
         create_slave("mipsswbrd002", properties={'jobs' : 6}, max_builds=1),