update ucontext factory to download the archive instead of using svn; use only one...

[simgrid.git] / build / buildbot / master / master.cfg

diff --git a/build/buildbot/master/master.cfg b/build/buildbot/master/master.cfg
index 6f8be01..81b87cf 100644 (file)
--- a/build/buildbot/master/master.cfg
+++ b/build/buildbot/master/master.cfg
@@ -18,10 +18,8 @@ c['projectURL']= "http://simgrid.gforge.inria.fr/"
 c['buildbotURL'] = "http://bob.loria.fr:8010/"
 
 # Gets bot from account module (hide passphrases)
-from account import bots
-c['bots'] = bots
-from account import all_slaves
-
+from account import slaves,all_slaves
+c['slaves'] = slaves
 
 # Port number used by slaves
 c['slavePortnum'] = 9989
@@ -73,14 +71,14 @@ pthreads_factory_O3.addStep(CustomCheck,name ="check all",        description =
                             haltOnFailure = True,command=["./checkall"])
                             
 ucontext_factory_O3= factory.BuildFactory()
-ucontext_factory_O3.addStep(CustomSVN, name ="{svn update}",baseURL='svn://scm.gforge.inria.fr/svn/simgrid/simgrid/', defaultBranch='trunk', mode="update")
-ucontext_factory_O3.addStep(ShellCommand,name = "{svn revert}",description = "running svn revert",descriptionDone = "svn revert",
-                            environ={"LC_ALL":"C"}, haltOnFailure = True,command=["svn" ,"revert","-R","."])
-ucontext_factory_O3.addStep(CustomConfigure,name ="{configure}",description="running configure",descriptionDone="configure",
+ucontext_factory_O3.addStep(ShellCommand,name="cleanup",descriptionDone="cleanup",command=["bash","-c","rm -rf * .svn"])
+ucontext_factory_O3.addStep(FileDownload(name="get archive",haltOnFailure=True,slavedest=WithProperties(archive),mastersrc=WithProperties(archive)))
+ucontext_factory_O3.addStep(ShellCommand, name ="open archive",descriptionDone="open archive", command=["tar","xvfz",WithProperties(archive),"--strip","1"])
+ucontext_factory_O3.addStep(CustomConfigure,name ="configure",description="running configure",descriptionDone="configure",
                             environ={"LC_ALL":"C"}, haltOnFailure = True,command=["./configure", "--with-context=ucontext","--enable-compile-warnings","--enable-compile-optimizations","--enable-botbuild"]) # Main difference with pthread_factory
-ucontext_factory_O3.addStep(ShellCommand,name = "{make}",description = "running make",descriptionDone = "make",
-                            environ={"LC_ALL":"C"}, haltOnFailure = True,command=["make"])
-ucontext_factory_O3.addStep(CustomCheck,name = "{check all}",description = "running check all",descriptionDone ="check all",
+ucontext_factory_O3.addStep(ShellCommand,name = "make",description = "running make",descriptionDone = "make",
+                            environ={"LC_ALL":"C"}, haltOnFailure = True,command=["make","-j","10"])
+ucontext_factory_O3.addStep(CustomCheck,name = "check all",description = "running check all",descriptionDone ="check all",
                             environ={"LC_ALL":"C"}, haltOnFailure = True,command=["./checkall"])
 
 
@@ -99,21 +97,19 @@ fastnet_lock = locks.MasterLock("fastnet_lock")
 # builders
 c['builders'] = [    
      {'name':'distBuilder',
-     'slavename':'bob_dist_worker',
+     'slavename':'bob_dist',
      'builddir':'/var/lib/buildbot/simgrid/dist-worker',
      'factory':dist_factory},
      
      {'name':'linux_amd64_pthreads_O3',
-     'slavename':'bob_pthreads',
+     'slavename':'bob',
      'builddir':'/var/lib/buildbot/simgrid/linux_amd64_pthreads/builddir_O3',
-     'factory':pthreads_factory_O3,
-     'locks': [bob_lock]},
+     'factory':pthreads_factory_O3},
        
      {'name':'linux_amd64_ucontext_O3',
-     'slavename':'bob_ucontext',
+     'slavename':'bob',
      'builddir':'/var/lib/buildbot/simgrid/linux_amd64_ucontext/builddir_O3',
-     'factory':ucontext_factory_O3,
-     'locks': [bob_lock]},
+     'factory':ucontext_factory_O3},
      
      {'name':'linux_i386_pthreads_O3',
      'slavename':'artimon_pthreads',