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

[Duncan Sands]

Author: baldrick
Date: Wed Nov 10 09:04:08 2010
New Revision: 118680

URL: http://llvm.org/viewvc/llvm-project?rev=118680&view=rev
Log:
The main reason for the dragonegg builders is to fail is a timeout, usually
when compiling insn-attrtab.c (a huge file).  Increase the timeout from 20
minutes to 60 minutes.

Modified:
    zorg/trunk/buildbot/osuosl/master/config/builders.py
    zorg/trunk/zorg/buildbot/builders/ScriptedBuilder.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=118680&r1=118679&r2=118680&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Wed Nov 10 09:04:08 2010
@@ -224,7 +224,8 @@
                                            mode='update', baseURL='http://llvm.org/svn/llvm-project/dragonegg/',
                                            defaultBranch='trunk',
                                            workdir="dragonegg.src"),],
-                       launcher     = 'dragonegg.src/extras/buildbot_self_strap-32',),
+                       launcher     = 'dragonegg.src/extras/buildbot_self_strap-32',
+                       timeout      = 60),
          'category'  : 'dragonegg'},
 
         {'name' : 'dragonegg-x86_64-linux',
@@ -239,7 +240,8 @@
                                            mode='update', baseURL='http://llvm.org/svn/llvm-project/dragonegg/',
                                            defaultBranch='trunk',
                                            workdir="dragonegg.src"),],
-                       launcher     = 'dragonegg.src/extras/buildbot_self_strap',),
+                       launcher     = 'dragonegg.src/extras/buildbot_self_strap',
+                       timeout      = 60),
          'category'  : 'dragonegg'},
 
         ]

Modified: zorg/trunk/zorg/buildbot/builders/ScriptedBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/ScriptedBuilder.py?rev=118680&r1=118679&r2=118680&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/ScriptedBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/ScriptedBuilder.py Wed Nov 10 09:04:08 2010
@@ -8,7 +8,8 @@
                       build_script = None, # Build script name or common prefix.
                       extra_args   = [],   # Extra args common for all steps.
                       build_steps  = [],   # List of step commands.
-                      env          = {}):  # Environmental variables for all steps.
+                      env          = {},   # Environmental variables for all steps.
+                      timeout      = 20):  # Timeout if no activity seen (minutes).
 
     # Validate input parameters
     if not launcher:
@@ -96,6 +97,7 @@
             haltOnFailure = True,
             description   = "Run build script",
             workdir       = ".",
-            env           = env))
+            env           = env,
+            timeout       = timeout*60))
 
     return f