[zorg] r281703 - Shuffle builder load on ericwf-buildslaves and remove redundant builder

[Eric Fiselier via llvm-commits]

Author: ericwf
Date: Thu Sep 15 23:31:35 2016
New Revision: 281703

URL: http://llvm.org/viewvc/llvm-project?rev=281703&view=rev
Log:
Shuffle builder load on ericwf-buildslaves and remove redundant builder

Modified:
    zorg/trunk/buildbot/osuosl/master/config/builders.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=281703&r1=281702&r2=281703&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Thu Sep 15 23:31:35 2016
@@ -952,7 +952,7 @@ def _get_libcxx_builders():
         'category': 'libcxx'},
 
         {'name': 'libcxx-libcxxabi-x86_64-linux-ubuntu-asan',
-         'slavenames': ['ericwf-buildslave'],
+         'slavenames': ['ericwf-buildslave2'],
          'builddir' : 'libcxx-libcxxabi-x86_64-linux-ubuntu-asan',
          'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
             env={'PATH': '/usr/local/bin:/usr/bin:/bin',
@@ -962,7 +962,7 @@ def _get_libcxx_builders():
         'category': 'libcxx'},
 
         {'name': 'libcxx-libcxxabi-x86_64-linux-ubuntu-ubsan',
-         'slavenames': ['ericwf-buildslave'],
+         'slavenames': ['ericwf-buildslave2'],
          'builddir' : 'libcxx-libcxxabi-x86_64-linux-ubuntu-ubsan',
          'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
             env={'PATH': '/usr/local/bin:/usr/bin:/bin',
@@ -1001,15 +1001,6 @@ def _get_libcxx_builders():
             cmake_extra_opts={'LLVM_USE_SANITIZER': 'Thread'},
             lit_extra_opts={'std':'c++1z'}),
         'category': 'libcxx'},
-        
-        {'name': 'libcxx-libcxxabi-x86_64-linux-ubuntu-unstable-abi',
-         'slavenames': ['ericwf-buildslave2'],
-         'builddir' : 'libcxx-libcxxabi-x86_64-linux-ubuntu-unstable-abi',
-         'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
-            env={'PATH': '/usr/local/bin:/usr/bin:/bin',
-                 'CC': 'clang', 'CXX': 'clang++'},
-            cmake_extra_opts={'LIBCXX_ABI_UNSTABLE': 'ON'}),
-        'category': 'libcxx'},
 
         {'name': 'libcxx-libcxxabi-x86_64-linux-ubuntu-gcc49-cxx11',
          'slavenames': ['ericwf-buildslave2'],