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

Galina Kistanova gkistanova at gmail.com
Fri Dec 7 13:34:22 PST 2012


Author: gkistanova
Date: Fri Dec  7 15:34:22 2012
New Revision: 169635

URL: http://llvm.org/viewvc/llvm-project?rev=169635&view=rev
Log:
Added slave osu8 and builders for it (llvm-x86_64-linux-vg_leak, clang-x86_64-linux-vg, clang-x86_64-linux-selfhost-rel, clang-x86_64-linux-fnt).

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=169635&r1=169634&r2=169635&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Fri Dec  7 15:34:22 2012
@@ -67,6 +67,12 @@
          'slavenames':["coho"],
          'builddir':"llvm-ppc64-2",
          'factory': LLVMBuilder.getLLVMBuildFactory("ppc64-linux-gnu", jobs=4, clean=False, timeout=20)},
+        {'name': "llvm-x86_64-linux-vg_leak",
+         'slavenames':["osu8"],
+         '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')},
         ]
 
 # Offline.
@@ -82,29 +88,12 @@
  'slavenames':["nick1"],
  'builddir':"llvm-ppc",
  'factory': LLVMBuilder.getLLVMBuildFactory("ppc-linux-gnu", jobs=1, clean=False, timeout=40)},
-{'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-linux",
  'slavenames': ["dunbar1"],
  'builddir': "llvm-i686",
  'factory': LLVMBuilder.getLLVMBuildFactory("i686-pc-linux-gnu", jobs=2, enable_shared=True)},
 
 # Offline.
-{'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-gcc-i686-darwin10-selfhost",
  'slavenames':["dunbar-darwin10"],
  'builddir':"llvm-gcc-i686-darwin10-selfhost",
@@ -227,6 +216,27 @@
                                                        stage1_config='Release+Asserts',
                                                        stage2_config='Release+Asserts')},
 
+         {'name': "clang-x86_64-linux-vg",
+          'slavenames':["osu8"],
+          'builddir':"clang-x86_64-linux-vg",
+          'factory': ClangBuilder.getClangBuildFactory(valgrind=True)},
+
+         {'name' : "clang-x86_64-linux-selfhost-rel",
+          'slavenames' : ["osu8"],
+          '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-x86_64-linux-fnt",
+          'slavenames' : ['osu8'],
+          '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)},
+
         # Clang cross builders.
         {'name' : "clang-x86_64-darwin11-cross-mingw32",
          'slavenames' :["as-bldslv11"],
@@ -309,31 +319,6 @@
  'builddir':"clang-i386-auroraux",
  'factory': ClangBuilder.getClangBuildFactory("i386-pc-auroraux",
                                               jobs="%(jobs)s", make='gmake')},
-{'name': "clang-x86_64-linux-vg",
- 'slavenames':["osu7"],
- 'builddir':"clang-x86_64-linux-vg",
- 'factory': ClangBuilder.getClangBuildFactory(valgrind=True)},
-{'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-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-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')},
 {'name': "clang-x86_64-linux",
  'slavenames':["gcc14"],
  'builddir':"clang-x86_64-linux",

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=169635&r1=169634&r2=169635&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/slaves.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/slaves.py Fri Dec  7 15:34:22 2012
@@ -166,6 +166,9 @@
         # POWER7 PowerPC (powerpc64), Fedora16.
         create_slave("coho", properties={'jobs': 12}, max_builds=4),
 
+        # Debian 86_64, 2 x 6-core Opteron 2.6 GHz
+        create_slave("osu8", properties={'jobs' : 6}, max_builds=4),
+
         # Defunct.
         # Pentium Dual CPU T3400 @ 2.1GHz
         #create_slave("dumitrescu1", properties={'jobs' : 2}, max_builds=1),
@@ -190,9 +193,6 @@
         #create_slave("dunbar-win32-2", properties={'jobs' : 2}, max_builds=1),
         #create_slave("osu1", properties={'jobs' : 4}, max_builds=1),
         #create_slave("osu2", properties={'jobs' : 4}, max_builds=2),
-        # 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),
         #create_slave("andrew1"),
         #create_slave("danmbp1"),
         # FreeBSD zero.sajd.net 9.0-CURRENT i386





More information about the llvm-commits mailing list