[zorg] r314738 - Remove dead ericwf-buildslave builder; move configurations to other slaves

[Eric Fiselier via llvm-commits]

Author: ericwf
Date: Mon Oct  2 16:16:56 2017
New Revision: 314738

URL: http://llvm.org/viewvc/llvm-project?rev=314738&view=rev
Log:
Remove dead ericwf-buildslave builder; move configurations to other slaves

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=314738&r1=314737&r2=314738&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Mon Oct  2 16:16:56 2017
@@ -1158,8 +1158,7 @@ def _get_openmp_builders():
         ]
 
 def _get_libcxx_builders():
-    ericwf_slaves = ['ericwf-buildslave2', 'ericwf-buildslave',
-                     'ericwf-buildslave-fast']
+    ericwf_slaves = ['ericwf-buildslave2', 'ericwf-buildslave-fast']
     return [
         # gribozavr's builders on gribozavr4 
         {'name': 'libcxx-libcxxabi-x86_64-linux-debian',
@@ -1200,9 +1199,9 @@ def _get_libcxx_builders():
                                'LIBCXXABI_ENABLE_THREADS': 'OFF'}),
          'category': 'libcxx'},
 
-        # EricWF's builders on ericwf-buildslave
+        # EricWF's builders
         {'name': 'libcxx-libcxxabi-x86_64-linux-ubuntu-cxx03',
-         'slavenames': ['ericwf-buildslave'],
+         'slavenames': ericwf_slaves,
          'builddir' : 'libcxx-libcxxabi-x86_64-linux-ubuntu-cxx03',
          'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
             env={'PATH': '/usr/local/bin:/usr/bin:/bin',
@@ -1212,7 +1211,7 @@ def _get_libcxx_builders():
         'category': 'libcxx'},
 
         {'name': 'libcxx-libcxxabi-x86_64-linux-ubuntu-cxx11',
-         'slavenames': ['ericwf-buildslave'],
+         'slavenames': ericwf_slaves,
          'builddir' : 'libcxx-libcxxabi-x86_64-linux-ubuntu-cxx11',
          'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
             env={'PATH': '/usr/local/bin:/usr/bin:/bin',
@@ -1222,7 +1221,7 @@ def _get_libcxx_builders():
         'category': 'libcxx'},
 
         {'name': 'libcxx-libcxxabi-x86_64-linux-ubuntu-cxx14',
-         'slavenames': ['ericwf-buildslave'],
+         'slavenames': ericwf_slaves,
          'builddir' : 'libcxx-libcxxabi-x86_64-linux-ubuntu-cxx14',
          'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
             env={'PATH': '/usr/local/bin:/usr/bin:/bin',
@@ -1232,7 +1231,7 @@ def _get_libcxx_builders():
         'category': 'libcxx'},
 
         {'name': 'libcxx-libcxxabi-x86_64-linux-ubuntu-cxx1z',
-         'slavenames': ['ericwf-buildslave'],
+         'slavenames': ericwf_slaves,
          'builddir' : 'libcxx-libcxxabi-x86_64-linux-ubuntu-cxx1z',
          'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
             env={'PATH': '/usr/local/bin:/usr/bin:/bin',
@@ -1313,7 +1312,7 @@ def _get_libcxx_builders():
         'category': 'libcxx'},
 
         {'name': 'libcxx-libcxxabi-x86_64-linux-ubuntu-gcc-tot-cxx1z',
-         'slavenames': ['ericwf-buildslave'],
+         'slavenames': ericwf_slaves,
          'builddir' : 'libcxx-libcxxabi-x86_64-linux-ubuntu-gcc-tot-cxx1z',
          'factory': LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
             env={'PATH': '/usr/local/bin:/usr/bin:/bin',

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=314738&r1=314737&r2=314738&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/slaves.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/slaves.py Mon Oct  2 16:16:56 2017
@@ -148,8 +148,6 @@ def get_build_slaves():
         # IBM z13 (s390x), Ubuntu 16.04.2
         create_slave("systemz-1", properties={'jobs': 4}, max_builds=4),
 
-        # Ubuntu 14.04 x86_64, Intel(R) Xeon(R) CPU E5-1650 0 @ 3.20GHz
-        create_slave("ericwf-buildslave", properties={'jobs': 4}, max_builds=2),
         # Ubuntu 14.10 x86_64, Intel(R) Xeon(R) CPU E3-1245 V2 @ 3.40GHz
         create_slave('ericwf-buildslave2', properties={'jobs': 4}, max_builds=2),
         # Ubuntu 16.04 x86_64, Intel(R) Xeon(R) CPU E5649  @ 2.53GHz (24 threads)