[zorg] r228796 - Reverted r228642. Please talk to me and get the slave registered with the buildmsater first.

[Galina Kistanova]

Author: gkistanova
Date: Tue Feb 10 21:19:09 2015
New Revision: 228796

URL: http://llvm.org/viewvc/llvm-project?rev=228796&view=rev
Log:
Reverted r228642. Please talk to me and get the slave registered with the buildmsater first.

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=228796&r1=228795&r2=228796&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Tue Feb 10 21:19:09 2015
@@ -678,13 +678,6 @@ def _get_lldb_builders():
                         '--enable-optimized',
                         '--enable-assertions'],
                     env={'SHELL':"/bin/bash"})},
-	{'name': "lldb-x86_64-ubuntu-14.04",
-         'slavenames': ["lldb-build1-ubuntu-1404"],
-         'builddir': "buildWorkingDir",
-         'factory': LLDBBuilder.getLLDBUbuntuCMakeBuildFactory(
-                    triple=None,
-                    extra_configure_args=[],
-                    env={'SHELL':"/bin/bash"})},
        ]
 
 # Offline.

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=228796&r1=228795&r2=228796&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/slaves.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/slaves.py Tue Feb 10 21:19:09 2015
@@ -164,10 +164,6 @@ def get_build_slaves():
         # Windows Server 2008 R2, Quad 2.6GHz Intel Xeon(R) 4GB RAM
         create_slave("zturner-win2008", properties={'jobs': 4}, max_builds=1),
 
-	# Ubuntu x86-64, 51GiB System memory Intel(R) Xeon(R) CPU @ 2.60GHz
-        create_slave("lldb-build1-ubuntu-1404", properties={'jobs': 16, 'loadaverage':
-32},
-            max_builds=1),
         # Defunct.
         # Intel(R) Pentium(R) CPU G620 @ 2.60GHz, Ubuntu i686
         #create_slave("botether", properties={'jobs': 2}, max_builds=1),