[llvm-commits] [zorg] r105167 - /zorg/trunk/buildbot/osuosl/master/config/builders.py

[Duncan Sands]

Author: baldrick
Date: Sun May 30 08:06:47 2010
New Revision: 105167

URL: http://llvm.org/viewvc/llvm-project?rev=105167&view=rev
Log:
Change both DragonEgg builders (dragonegg-i386-linux and
dragonegg-x86_64-linux) to use buildbot ScriptedBuilder.
Patch by Galina Kistanova.

Modified:
    zorg/trunk/buildbot/osuosl/master/config/builders.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=105167&r1=105166&r2=105167&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Sun May 30 08:06:47 2010
@@ -213,13 +213,33 @@
         {'name' : 'dragonegg-i386-linux',
          'slavenames' : ['baldrick16'],
          'builddir' : 'dragonegg-i386-linux',
-         'factory' : DragonEggBuilder.getBuildFactory(triple='i386-pc-linux-gnu',
-                                                      build_script='buildbot_self_strap-32') },
+         '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-dragonegg',
+                                           mode='update', baseURL='http://llvm.org/svn/llvm-project/dragonegg/',
+                                           defaultBranch='trunk',
+                                           workdir="dragonegg.src"),],
+                       launcher     = 'dragonegg.src/extras/buildbot_self_strap-32',),
+         'category'  : 'dragonegg'},
 
         {'name' : 'dragonegg-x86_64-linux',
          'slavenames' : ['baldrick17'],
          'builddir' : 'dragonegg-x86_64-linux',
-         'factory' : DragonEggBuilder.getBuildFactory(triple='x86_64-pc-linux-gnu'), },
+         '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-dragonegg',
+                                           mode='update', baseURL='http://llvm.org/svn/llvm-project/dragonegg/',
+                                           defaultBranch='trunk',
+                                           workdir="dragonegg.src"),],
+                       launcher     = 'dragonegg.src/extras/buildbot_self_strap',),
+         'category'  : 'dragonegg'},
+
         ]
 
 def _get_experimental_builders():