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

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@6023 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/build/buildbot/dist-worker/buildbot.tac b/build/buildbot/dist-worker/buildbot.tac
index 78b3461..d059b41 100644 (file)
--- a/build/buildbot/dist-worker/buildbot.tac
+++ b/build/buildbot/dist-worker/buildbot.tac
@@ -5,8 +5,8 @@ from buildbot.slave.bot import BuildSlave
 basedir = r'/var/lib/buildbot/simgrid/dist-worker'
 host = 'bob.loria.fr'
 port = 9989
 basedir = r'/var/lib/buildbot/simgrid/dist-worker'
 host = 'bob.loria.fr'
 port = 9989

-slavename = 'bob_dist_worker'
-from account import passwd # Separate file to put this one in the SVN
+slavename = 'bob_dist'
+from slave_account import passwd # Separate file to put this one in the SVN

 keepalive = 600
 usepty = 1
 umask = None
 keepalive = 600
 usepty = 1
 umask = None

diff --git a/build/buildbot/linux_amd64_pthreads/buildbot.tac b/build/buildbot/linux_amd64_pthreads/buildbot.tac
index 61fb732..37f111d 100644 (file)
--- a/build/buildbot/linux_amd64_pthreads/buildbot.tac
+++ b/build/buildbot/linux_amd64_pthreads/buildbot.tac
@@ -5,7 +5,7 @@ from buildbot.slave.bot import BuildSlave
 basedir = r'/var/lib/buildbot/simgrid/linux_amd64_pthreads'
 host = 'bob.loria.fr'
 port = 9989
 basedir = r'/var/lib/buildbot/simgrid/linux_amd64_pthreads'
 host = 'bob.loria.fr'
 port = 9989

-slavename = 'bob_pthreads'
+slavename = 'bob'

 from slave_account import passwd # Separate file to put this one in the SVN
 keepalive = 600
 usepty = 1
 from slave_account import passwd # Separate file to put this one in the SVN
 keepalive = 600
 usepty = 1

diff --git a/build/buildbot/linux_amd64_ucontext/buildbot.tac b/build/buildbot/linux_amd64_ucontext/buildbot.tac
index b0c0c31..06dcad9 100644 (file)
--- a/build/buildbot/linux_amd64_ucontext/buildbot.tac
+++ b/build/buildbot/linux_amd64_ucontext/buildbot.tac
@@ -5,7 +5,7 @@ from buildbot.slave.bot import BuildSlave
 basedir = r'/var/lib/buildbot/simgrid/linux_amd64_ucontext'
 host = 'bob.loria.fr'
 port = 9989
 basedir = r'/var/lib/buildbot/simgrid/linux_amd64_ucontext'
 host = 'bob.loria.fr'
 port = 9989

-slavename = 'bob_ucontext'
+slavename = 'bob'

 from slave_account import passwd # Separate file to put this one in the SVN
 keepalive = 600
 usepty = 1
 from slave_account import passwd # Separate file to put this one in the SVN
 keepalive = 600
 usepty = 1

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)
 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
 
 # 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()
                             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
                             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"])
 
 
                             environ={"LC_ALL":"C"}, haltOnFailure = True,command=["./checkall"])
 
 


@@ -99,21 +97,19 @@ fastnet_lock = locks.MasterLock("fastnet_lock")
 # builders
 c['builders'] = [    
      {'name':'distBuilder',
 # 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',
      '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',
      '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',
        
      {'name':'linux_amd64_ucontext_O3',

-     'slavename':'bob_ucontext',
+     'slavename':'bob',

      'builddir':'/var/lib/buildbot/simgrid/linux_amd64_ucontext/builddir_O3',
      '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',
      
      {'name':'linux_i386_pthreads_O3',
      'slavename':'artimon_pthreads',