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

[Galina Kistanova]

Author: gkistanova
Date: Mon Jan 31 14:11:49 2011
New Revision: 124597

URL: http://llvm.org/viewvc/llvm-project?rev=124597&view=rev
Log:
Added new buildbot builder for 3-stage automated build on x86_64-apple-darwin10 of LLVM mingw32 cross-toolchain for arm-eabi hardfloat.

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=124597&r1=124596&r2=124597&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Mon Jan 31 14:11:49 2011
@@ -447,6 +447,89 @@
                                         'description'   : 'install llvm-gcc',
                                         'haltOnFailure' : True },]),
          'category'  : 'llvm-gcc' },
+		 
+        {'name'      : "llvm-gcc-build-x86_64-darwin10-x-mingw32-x-armeabi",
+         'slavenames': [ "kistanova1" ],
+         'builddir'  : "llvm-gcc-build-x86_64-darwin10-x-mingw32-x-armeabi",
+         'factory'   : ScriptedBuilder.getScriptedBuildFactory(
+                       source_code  = [SVN(name='svn-llvm',
+                                           mode='update', baseURL='http://llvm.org/svn/llvm-project/llvm/',
+                                           defaultBranch='trunk',
+                                           workdir="llvm.src"),
+                                       SVN(name='svn-llvm-gcc',
+                                           mode='update', baseURL='http://llvm.org/svn/llvm-project/llvm-gcc-4.2/',
+                                           defaultBranch='trunk',
+                                           workdir="llvm-gcc.src"),],
+                       launcher     = 'llvm-gcc.src/extras/buildbot-launcher',
+                       build_script = 'llvm-gcc.src/extras/build-darwin-x-mingw32-x-armeabi',
+                       extra_args   = [],
+                       build_steps  = [{'name'          : 'clean',
+                                        'description'   : 'clean',
+                                        'haltOnFailure' : True },
+                                       {'name'          : 'copy_cross_tools',
+                                        'description'   : 'copy cross_tools',
+                                        'haltOnFailure' : True },										
+                                       {'name'          : 'configure_llvm_1',
+                                        'description'   : 'configure llvm (stage 1)',
+                                        'haltOnFailure' : True },
+                                       {'name'          : 'make_llvm_1',
+                                        'description'   : 'make llvm (stage 1)',
+                                        'extra_args'    : ['-j8'],  # Extra step-specific properties
+                                        'haltOnFailure' : True },
+                                       {'name'          : 'test_llvm_1',
+                                        'description'   : 'test llvm (stage 1)',
+                                        'haltOnFailure' : False },										
+                                       {'name'          : 'configure_llvmgcc_1',
+                                        'description'   : 'configure llvm-gcc (stage 1)',
+                                        'haltOnFailure' : True },
+                                       {'name'          : 'make_llvmgcc_1',
+                                        'description'   : 'make llvm-gcc (stage 1)', # Note: one thread only here
+                                        'haltOnFailure' : True },
+                                       {'name'          : 'install_llvmgcc_1',
+                                        'description'   : 'install llvm-gcc (stage 1)',
+                                        'haltOnFailure' : True },
+                                       {'name'          : 'configure_llvm_2',
+                                        'description'   : 'configure llvm (stage 2)',
+                                        'haltOnFailure' : True },
+                                       {'name'          : 'make_llvm_2',
+                                        'description'   : 'make llvm (stage 2)',
+                                        'extra_args'    : ['-j8'],  
+                                        'haltOnFailure' : True },
+                                       {'name'          : 'test_llvm_2',
+                                        'description'   : 'test llvm (stage 2)',
+                                        'haltOnFailure' : False },										
+                                       {'name'          : 'configure_llvmgcc_2',
+                                        'description'   : 'configure llvm-gcc (stage 2)',
+                                        'haltOnFailure' : True },
+                                       {'name'          : 'make_llvmgcc_2',
+                                        'description'   : 'make llvm-gcc (stage 2)',
+                                        'extra_args'    : ['-j8'],  
+                                        'haltOnFailure' : True },
+                                       {'name'          : 'install_llvmgcc_2',
+                                        'description'   : 'install llvm-gcc (stage 2)',
+                                        'haltOnFailure' : True },										
+                                       {'name'          : 'configure_llvm_3',
+                                        'description'   : 'configure llvm (stage 3)',
+                                        'haltOnFailure' : True },
+                                       {'name'          : 'make_llvm_3',
+                                        'description'   : 'make llvm (stage 3)',
+                                        'extra_args'    : ['-j8'],  
+                                        'haltOnFailure' : True },
+                                       {'name'          : 'install_llvm_3',
+                                        'description'   : 'install llvm (stage 3)',
+                                        'haltOnFailure' : False },										
+                                       {'name'          : 'configure_llvmgcc_3',
+                                        'description'   : 'configure llvm-gcc (stage 3)',
+                                        'haltOnFailure' : True },
+                                       {'name'          : 'make_llvmgcc_3',
+                                        'description'   : 'make llvm-gcc (stage 3)',
+                                        'extra_args'    : ['-j8'], 
+                                        'haltOnFailure' : True },
+                                       {'name'          : 'install_llvmgcc_3',
+                                        'description'   : 'install llvm-gcc (stage 3)',
+                                        'haltOnFailure' : True },]),										
+
+         'category'  : 'llvm-gcc' },
 
         {'name'      : "llvm-gcc-native-mingw32",
          'slavenames': [ "kistanova2" ],

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=124597&r1=124596&r2=124597&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/slaves.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/slaves.py Mon Jan 31 14:11:49 2011
@@ -43,7 +43,7 @@
         create_slave("ranby1"),
 
         # Quad Core Mac Pro running Leopard.
-        create_slave("kistanova1", properties={'jobs' : 1}, max_builds=3),
+        create_slave("kistanova1", properties={'jobs' : 1}, max_builds=4),
 
         # Win XP SP3.
         create_slave("kistanova2", properties={'jobs' : 1}, max_builds=1),