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

Galina Kistanova gkistanova at gmail.com
Fri Oct 28 14:29:38 PDT 2011


Author: gkistanova
Date: Fri Oct 28 16:29:37 2011
New Revision: 143229

URL: http://llvm.org/viewvc/llvm-project?rev=143229&view=rev
Log:
Added new builder "clang-x86_64-ubuntu"; removed two off-line builders.

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=143229&r1=143228&r2=143229&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Fri Oct 28 16:29:37 2011
@@ -174,24 +174,16 @@
 # Clang builders.
 def _get_clang_builders():
     return [
-        {'name': "clang-i686-freebsd",
-         'slavenames':["freebsd1"],
-         'builddir':"clang-i686-freebsd",
-         'factory': ClangBuilder.getClangBuildFactory(clean=True, use_pty_in_tests=True)},
-
-        {'name' : "clang-i686-linux-fnt",
-         'slavenames' : ['balint1'],
-         'builddir' : "clang-i686-linux-fnt",
-         'factory' : NightlytestBuilder.getFastNightlyTestBuildFactory(triple='i686-pc-linux-gnu',
-                                                                       stage1_config='Release+Asserts',
-                                                                       test=False,
-                                                                       xfails=clang_i386_linux_xfails) },
-
         {'name': "clang-x86_64-debian",
          'slavenames':["gcc12"],
          'builddir':"clang-x86_64-debian",
          'factory': ClangBuilder.getClangBuildFactory()},
 
+        {'name': "clang-x86_64-ubuntu",
+         'slavename':["arxan_raphael"],
+         'builddir':"clang-x86_64-ubuntu",
+         'factory' : ClangBuilder.getClangBuildFactory()},
+
         {'name' : "clang-x86_64-debian-selfhost-rel",
          'slavenames' : ["gcc13"],
          'builddir' : "clang-x86_64-debian-selfhost-rel",
@@ -207,7 +199,7 @@
                                                                        stage1_config='Release+Asserts',
                                                                        test=False,
                                                                        xfails=clang_x86_64_linux_xfails)},
- 
+
         {'name': "clang-native-arm-cortex-a9",
          'slavenames':["kistanova6"],
          'builddir':"clang-native-arm-cortex-a9",
@@ -313,6 +305,17 @@
                                                useTwoStage=True,
                                                stage1_config='Release+Asserts',
                                                stage2_config='Debug+Asserts')},
+{'name': "clang-i686-freebsd",
+ 'slavenames':["freebsd1"],
+ 'builddir':"clang-i686-freebsd",
+ 'factory': ClangBuilder.getClangBuildFactory(clean=True, use_pty_in_tests=True)},
+{'name' : "clang-i686-linux-fnt",
+ 'slavenames' : ['balint1'],
+ 'builddir' : "clang-i686-linux-fnt",
+ 'factory' : NightlytestBuilder.getFastNightlyTestBuildFactory(triple='i686-pc-linux-gnu',
+                                                               stage1_config='Release+Asserts',
+                                                               test=False,
+                                                               xfails=clang_i386_linux_xfails) },
 
 def _get_dragonegg_builders():
     return [
@@ -735,15 +738,6 @@
                                         'haltOnFailure' : True },]),
          'category'  : 'llvm-gcc' },
 
-        {'name': "clang-i686-freebsd-selfhost-rel",
-         'slavenames':["freebsd1"],
-         'builddir':"clang-i686-freebsd-selfhost-rel",
-         'factory': ClangBuilder.getClangBuildFactory(triple='i686-pc-freebsd',
-                                                      useTwoStage=True,
-                                                      stage1_config='Release+Asserts',
-                                                      stage2_config='Release+Asserts'),
-         'category' : 'clang.exp' },
-
         ]
 
 def get_builders():
@@ -843,3 +837,11 @@
 # 'builddir' :"clang-i686-xp-msvc9_alt",
 # 'factory' : ClangBuilder.getClangMSVCBuildFactory(jobs=2),
 # 'category' : 'clang.exp' },
+{'name': "clang-i686-freebsd-selfhost-rel",
+ 'slavenames':["freebsd1"],
+ 'builddir':"clang-i686-freebsd-selfhost-rel",
+ 'factory': ClangBuilder.getClangBuildFactory(triple='i686-pc-freebsd',
+                                              useTwoStage=True,
+                                              stage1_config='Release+Asserts',
+                                              stage2_config='Release+Asserts'),
+ '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=143229&r1=143228&r2=143229&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/slaves.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/slaves.py Fri Oct 28 16:29:37 2011
@@ -10,9 +10,6 @@
 
 def get_build_slaves():
     return [
-        # FreeBSD zero.sajd.net 9.0-CURRENT i386
-        create_slave("freebsd1", properties={'jobs' : 1}, max_builds=1),
-
         # CPU Marvell Kirkwood 88F6281 ARM Based armv5tejl running at 1.2Ghz
         # Memory 512MB SDRAM
         # Power 2.3w idle no attached devices, 7.0w running at 100% CPU utilization
@@ -129,15 +126,15 @@
         # 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, P4 2.8GHz, 1GB mem
-        create_slave("balint1", properties={'jobs' : 1}, max_builds=1),
-
         # AMD Athlon(tm) 64 X2 Dual Core 3800+, Ubuntu x86_64
         create_slave("grosser1", properties={'jobs': 2}, max_builds=1),
 
         # Intel(R) Core(TM)2 CPU 6420  @ 2.13GHz, Ubuntu Oneiric x86_64
         create_slave("arxan_davinci", properties={'jobs': 4}, max_builds=1),
 
+        # Intel(R) Core(TM)2 CPU 6420  @ 2.13GHz, Ubuntu Oneiric x86_64
+        create_slave("arxan_raphael", properties={'jobs': 4}, max_builds=1),
+
         # 2005 PowerPC Mac Mini, Mac OS X 10.5
         create_slave("arxan_bellini", properties={'jobs': 2}, max_builds=1),
 
@@ -170,4 +167,8 @@
         #create_slave("osu8", properties={'jobs' : 6}, max_builds=4),
         #create_slave("andrew1"),
         #create_slave("danmbp1"),
+        # FreeBSD zero.sajd.net 9.0-CURRENT i386
+        #create_slave("freebsd1", properties={'jobs' : 1}, max_builds=1),
+        # Debian, P4 2.8GHz, 1GB mem
+        #create_slave("balint1", properties={'jobs' : 1}, max_builds=1),
         ]





More information about the llvm-commits mailing list