[llvm-commits] [zorg] r142899 - in /zorg/trunk/buildbot/osuosl/master/config: builders.py slaves.py

Galina Kistanova gkistanova at gmail.com
Mon Oct 24 18:28:53 PDT 2011


Author: gkistanova
Date: Mon Oct 24 20:28:53 2011
New Revision: 142899

URL: http://llvm.org/viewvc/llvm-project?rev=142899&view=rev
Log:
Removed few not working build 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=142899&r1=142898&r2=142899&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Mon Oct 24 20:28:53 2011
@@ -54,18 +54,6 @@
                                     'CXX': "/usr/bin/g++-4.2" },
                             extra_configure_args=['--enable-shared'],
                             timeout=600)},
-        {'name': "llvm-i686-linux-vg_leak",
-         'slavenames':["osu8"],
-         'builddir':"llvm-i686-linux-vg_leak",
-         'factory': LLVMBuilder.getLLVMBuildFactory("i686-pc-linux-gnu", valgrind=True,
-                                                     valgrindLeakCheck=True,
-                                                     valgrindSuppressions='utils/valgrind/i386-pc-linux-gnu.supp')},
-        {'name': "llvm-x86_64-linux-vg_leak",
-         'slavenames':["osu7"],
-         'builddir':"llvm-x86_64-linux-vg_leak",
-         'factory': LLVMBuilder.getLLVMBuildFactory("x86_64-pc-linux-gnu", valgrind=True,
-                                                     valgrindLeakCheck=True,
-                                                     valgrindSuppressions='utils/valgrind/x86_64-pc-linux-gnu.supp')},
         {'name': "llvm-i686-debian",
          'slavenames': ["gcc15"],
          'builddir': "llvm-i686-debian",
@@ -120,11 +108,7 @@
 #         'builddir':"llvm-gcc-x86_64-darwin10-selfhost",
 #         'factory':LLVMGCCBuilder.getLLVMGCCBuildFactory(4, triple='x86_64-apple-darwin10',
 #                                                         gxxincludedir='/usr/include/c++/4.2.1')},
-        {'name' : "llvm-gcc-x86_64-linux-selfhost",
-         'slavenames':["osu7"],
-         'builddir':"llvm-gcc-x86_64-linux-selfhost",
-         'factory':LLVMGCCBuilder.getLLVMGCCBuildFactory(triple='x86_64-pc-linux-gnu',
-                                                         extra_configure_args=['--disable-multilib'])},
+
         {'name' : "llvm-x86_64-linux-checks",
          'slavenames':["gcc10"],
          'builddir':"llvm-x86_64-linux-checks",
@@ -192,12 +176,6 @@
 #         'slavenames' :['dunbar-win32-2'],
 #         'builddir' :"clang-i686-xp-msvc9",
 #         'factory' : ClangBuilder.getClangMSVCBuildFactory(jobs=2)},
-
-         {'name': "clang-x86_64-linux-vg",
-          'slavenames':["osu7"],
-          'builddir':"clang-x86_64-linux-vg",
-          'factory': ClangBuilder.getClangBuildFactory(valgrind=True)},
-
 #        {'name' : "clang-x86_64-darwin10-selfhost",
 #         'slavenames' : ["dunbar-darwin10"],
 #         'builddir' : "clang-x86_64-darwin10-selfhost",
@@ -206,14 +184,6 @@
 #                                                       stage1_config='Release+Asserts',
 #                                                       stage2_config='Debug+Asserts')},
 
-        {'name' : "clang-x86_64-linux-selfhost-rel",
-         'slavenames' : ["osu7"],
-         'builddir' : "clang-x86_64-linux-selfhost-rel",
-         'factory' : ClangBuilder.getClangBuildFactory(triple='x86_64-pc-linux-gnu',
-                                                       useTwoStage=True,
-                                                       stage1_config='Release+Asserts',
-                                                       stage2_config='Release+Asserts')},
-
         {'name' : "clang-i686-linux-fnt",
          'slavenames' : ['balint1'],
          'builddir' : "clang-i686-linux-fnt",
@@ -222,14 +192,6 @@
                                                                        test=False,
                                                                        xfails=clang_i386_linux_xfails) },
 
-        {'name' : "clang-x86_64-linux-fnt",
-         'slavenames' : ['osu7'],
-         'builddir' : "clang-x86_64-linux-fnt",
-         'factory' : NightlytestBuilder.getFastNightlyTestBuildFactory(triple='x86_64-pc-linux-gnu',
-                                                                       stage1_config='Release+Asserts',
-                                                                       test=False,
-                                                                       xfails=clang_x86_64_linux_xfails) },
-
         {'name': "clang-x86_64-debian",
          'slavenames':["gcc12"],
          'builddir':"clang-x86_64-debian",
@@ -763,16 +725,6 @@
 #                                        'description'   : 'install llvm-gcc',
 #                                        'haltOnFailure' : True },]),
 #         'category'  : 'llvm-gcc' },
-
-        {'name' : "clang-i686-linux-selfhost-rel",
-         'slavenames' : ["osu8"],
-         'builddir' : "clang-i686-linux-selfhost-rel",
-         'factory' : ClangBuilder.getClangBuildFactory(triple='i686-pc-linux-gnu',
-                                                       useTwoStage=True,
-                                                       stage1_config='Release+Asserts',
-                                                       stage2_config='Release+Asserts'),
-         'category' : 'clang.exp' },
-
 #        {'name' : "clang-i686-xp-msvc9_alt",
 #         'slavenames' :['adobe1'],
 #         'builddir' :"clang-i686-xp-msvc9_alt",
@@ -821,8 +773,4 @@
  'builddir':"clang-x86_64-openbsd",
  'factory': ClangBuilder.getClangBuildFactory(),
  'category':'clang.exp'}
-{'name': "clang-x86_64-linux-checks",
- 'slavenames':["osu2"],
- 'builddir':"clang-x86_64-linux-checks",
- 'factory': ClangBuilder.getClangBuildFactory(stage1_config='Debug+Asserts+Checks'),
- 'category':'clang.exp'}
+

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=142899&r1=142898&r2=142899&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/slaves.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/slaves.py Mon Oct 24 20:28:53 2011
@@ -10,8 +10,6 @@
 
 def get_build_slaves():
     return [
-        create_slave("osu1", properties={'jobs' : 4}, max_builds=1),
-
         # FreeBSD zero.sajd.net 9.0-CURRENT i386
         create_slave("freebsd1", properties={'jobs' : 1}, max_builds=1),
 
@@ -159,10 +157,6 @@
         # gcc201 8011  80G   4x0.4 GHz  TI UltraSparc II (BlackBird) / 4 GB RAM / Sun E250 / Gentoo sparc64
         create_slave("gcc201", properties={'jobs' : 2}, max_builds=1),
 
-        # Debian x86_64, 2 x 6-core Opteron 2.6 GHz
-        create_slave("osu7", properties={'jobs' : 6}, max_builds=4),
-        create_slave("osu8", properties={'jobs' : 6}, max_builds=4),
-
         # Debian, P4 2.8GHz, 1GB mem
         create_slave("balint1", properties={'jobs' : 1}, max_builds=1),
 
@@ -179,7 +173,6 @@
         create_slave("arxan_bellini", properties={'jobs': 2}, max_builds=1),
 
         # Defunct.
-        #create_slave("osu2", properties={'jobs' : 4}, max_builds=2),
         #create_slave("andrew1"),
         #create_slave("danmbp1"),
         ]





More information about the llvm-commits mailing list