Merge commit 'origin/master'

[build.git] / run-nightlies.py

diff --git a/run-nightlies.py b/run-nightlies.py
index 3e742ec..3c8035c 100755 (executable)
--- a/run-nightlies.py
+++ b/run-nightlies.py
@@ -3,9 +3,15 @@
 
 import os
 import re
+import shlex
+import subprocess
+import time
+
+PARALLEL_BUILD = False
 
 # Assemble a list of builds from a single build spec
 def interpret_build(build, param_names, current_concrete_build={}, concrete_build_list=[]):
+        
         if (param_names==[]):
                 concrete_build_list.extend([current_concrete_build])
         else:
@@ -41,13 +47,13 @@ def concrete_build_to_commandline(concrete_build):
     
     cmdline = '''%(sh)s 
             %(vbuildnightly)s
-            -b %(pldistro)s-%(fcdistro)s-%(arch)s-%(myplcversion)s-%(release)s-%(date)s
+           -b pl-%(fcdistro)s-%(arch)s-%(myplcversion)s-%(release)s-%(date)s
             -f %(fcdistro)s 
             -m %(mailto)s 
             -p %(personality)s
             -r %(webpath)s
-            -s %(svnpath)s
-            -t %(tags)s 
+            -s %(scmpath)s
+            -t %(tags)s
             -w %(webpath)s/%(pldistro)s/%(fcdistro)s
             %(runtests)s'''.replace('\n','')
 
@@ -71,12 +77,18 @@ def reduce_dependencies(concrete_build):
 def process_builds (builds, build_names, default_build):
         for build_name in build_names:
                 build = complete_build_spec_with_defaults (builds[build_name], default_build)
-                concrete_builds_without_deps = interpret_build (build, build.keys())
-                concrete_builds = map(lambda cb: reduce_dependencies(cb), concrete_builds_without_deps)
-                for concrete_build in concrete_builds:
-                        build_commandline = concrete_build_to_commandline(concrete_build)
-                        os.system(build_commandline)
-        
+                concrete_builds_without_deps = interpret_build (build, build.keys(), {}, [])
+                concrete_builds = map(reduce_dependencies, concrete_builds_without_deps)
+                commandlines = map(concrete_build_to_commandline, concrete_builds)
+                for commandline in commandlines:
+                    if PARALLEL_BUILD == True:
+                        args = shlex.split(commandline)
+                        subprocess.Popen(args)
+                        # workaround the vserver race
+                        time.sleep(60)
+                    else:           
+                        os.system(commandline)
+
 def main():
         config_file = '/etc/build-conf-planetlab.py'
         builds = {}