buildfarm r489: foo - Projects

26 Mar 2008

URL: https://svn.lrde.epita.fr/svn/lrde-tools/trunk/buildbot/masters
ChangeLog:
2008-03-26  Your Friendly AutoBuilder  build@lrde.epita.fr
* buildfactory.py,
    * buildfarm.sh: Fix minor bugs.
    * oln_master.cfg,
    * spot_master.cfg: Clean bots config.
    * vaucanson-bmi_master.cfg: Remove.
    * vaucanson_master.cfg: Clean bots config.
    * www/index.php: Remove bmi + change latest build links.
---
 buildfactory.py      |    9 +++------
 buildfarm.sh         |    6 +++---
 oln_master.cfg       |   35 ++++++++++++-----------------------
 spot_master.cfg      |   21 ++++++++++++++-------
 vaucanson_master.cfg |   41 +++++++++++++++++++++++++++++++----------
 www/index.php        |    1 -
 6 files changed, 63 insertions(+), 50 deletions(-)
Index: trunk/buildbot/masters/vaucanson-bmi_master.cfg (deleted)
===================================================================
Index: trunk/buildbot/masters/oln_master.cfg
===================================================================

--- trunk/buildbot/masters/oln_master.cfg	(revision 488)
+++ trunk/buildbot/masters/oln_master.cfg	(revision 489)
@@ -46,11 +46,10 @@
                                  treeStableTimer=10*60,
                                  # When a change occurs, wait 10 minutes before
                                  # lunching the build.
-                                 builderNames=['mingw32-gcc-3.4.5',
-                                               'powerpc-apple-darwin8-gcc-4.0.1',
-                                               'i686-apple-darwin8-gcc-4.0.1',
+                                 builderNames=['powerpc-apple-darwin8-gcc-4.0.1',
                                                'i486-linux-gnu-gcc-4.1',
-                                               'i486-linux-gnu-gcc-3.3']))
+                                               'i486-linux-gnu-gcc-3.3',
+					       'x86-64-linux-gnu-gcc-4.1']))
####### BUILDSLAVES
@@ -60,11 +59,11 @@
 # tuple of bot-name and bot-password. These correspond to values given to the
 # buildslave's mktap invocation.
 from buildbot.buildslave import BuildSlave
-c['slaves'] = [BuildSlave('bot-winxp-mingw', 'r->+@D2k[kH5:!'),
+c['slaves'] = [
              BuildSlave('bot-macppc', 'Yk]0"gQVE<N>{_'),
-             BuildSlave('bot-macx86', '>_o965tA--6+?}'),
              BuildSlave('bot-linux-gcc3', 'X_!H%#2/t6,r8$'),
              BuildSlave('bot-linux-gcc4', 'fZLgd,R*8z.TZ)'),
+	       BuildSlave('bot-64', 'X_!H%#2/B8z.TZ')
              ]
####### BUILDERS
@@ -102,26 +101,11 @@
   extra_configure_args='CC=gcc-3.3 CXX=g++-3.3',
   install_dir='oln_gcc3')
-f_oln_mingw = GNUBuildSystem(project_repos='oln',
-  project_name='olena',
-  branch=mybranch,
-  extra_configure_args='--host=mingw32 --build=i686-pc-cygwin')
-
-builder_oln_winxp_mingw = {'name': 'mingw32-gcc-3.4.5',
-                         'slavename': 'bot-winxp-mingw',
-                         'builddir': 'oln_winxp_mingw',
-                         'factory': f_oln_mingw
-                        }
 builder_oln_macppc = {'name': 'powerpc-apple-darwin8-gcc-4.0.1',
                           'slavename': 'bot-macppc',
                           'builddir': 'oln_macppc',
                           'factory': f_oln_unix
                          }
-builder_oln_macx86 = {'name': 'i686-apple-darwin8-gcc-4.0.1',
-                          'slavename': 'bot-macx86',
-                          'builddir': 'oln_macx86',
-                          'factory': f_oln_unix
-                         }
 builder_oln_linux_gcc4 = {'name': 'i486-linux-gnu-gcc-4.1',
                           'slavename': 'bot-linux-gcc4',
                           'builddir': 'oln_linux_gcc4',
@@ -132,12 +116,17 @@
                           'builddir': 'oln_linux_gcc3',
                           'factory': f_oln_unix_gcc3
                          }
+builder_oln_64 = {'name': 'x86-64-linux-gnu-gcc-4.1',
+                          'slavename': 'bot-64',
+                          'builddir': 'oln_64',
+                          'factory': f_oln_unix
+                 }
-c['builders'] = [builder_oln_winxp_mingw,
+c['builders'] = [
                  builder_oln_macppc,
-                 builder_oln_macx86,
                  builder_oln_linux_gcc3,
                  builder_oln_linux_gcc4,
+                 builder_oln_64
                 ]
####### STATUS TARGETS
Index: trunk/buildbot/masters/www/index.php
===================================================================
--- trunk/buildbot/masters/www/index.php	(revision 488)
+++ trunk/buildbot/masters/www/index.php	(revision 489)
@@ -11,7 +11,6 @@
   <Ul>
     <li><a href="buildfarm/oln/">Olena (trunk)</a></li>
     <li><a href="buildfarm/vaucanson/">Vaucanson (trunk)</a></li>
-    <li><a href="buildfarm/vaucanson-bmi/">Vaucanson (bmi)</a></li>
     <li><a href="buildfarm/spot/">Spot</a></li>
   </ul>
 <H2>Latest builds</h2>
Index: trunk/buildbot/masters/vaucanson_master.cfg
===================================================================
--- trunk/buildbot/masters/vaucanson_master.cfg	(revision 488)
+++ trunk/buildbot/masters/vaucanson_master.cfg	(revision 489)
@@ -46,11 +46,11 @@
                                  treeStableTimer=10*60,
                                  # When a change occurs, wait 10 minutes before
                                  # lunching the build.
-                                 builderNames=[
-                                               'powerpc-apple-darwin8-gcc-4.0.1',
+                                 builderNames=['powerpc-apple-darwin8-gcc-4.0.1',
                                                'i486-linux-gnu-gcc-4.1',
                                                'i486-linux-gnu-gcc-4.1-enst',
-                                               'i486-linux-gnu-gcc-3.3']))
+                                               'i486-linux-gnu-icc-10.1',
+                                               'x86-64-linux-gcc-4.1']))
####### BUILDSLAVES
@@ -65,6 +65,7 @@
                BuildSlave('bot-linux-gcc3', 'EV5Q/[^[C%Z|>+'),
                BuildSlave('bot-linux-gcc4', 'C"[f7^vXy^KX/*'),
                BuildSlave('bot-linux-gcc4-enst', '"[fC7^[^[C%Z|>'),
+               BuildSlave('bot-64', '"[C%Z|fC7^[^[>'),
                ]
####### BUILDERS
@@ -94,16 +95,30 @@
f_vaucanson_unix = GNUBuildSystem(project_repos='vaucanson',
   branch=mybranch,
+  install_cmd=None,
+  dist_cmd=None,
+  upload_cmd=None)
+
+f_vaucanson_unix_64 = GNUBuildSystem(project_repos='vaucanson',
+  branch=mybranch,
+  extra_configure_args='--with-boost=/data2/cluster/lrde/build',
+  install_cmd=None,
+  dist_cmd=None,
   upload_cmd=None)
f_vaucanson_unix_upload = GNUBuildSystem(project_repos='vaucanson',
   branch=mybranch,
+  install_cmd=None,
+  dist_cmd=None,
   upload_cmd='./lrde-upload.sh')
-f_vaucanson_unix_gcc3 = GNUBuildSystem(project_repos='vaucanson',
+f_vaucanson_unix_icc = GNUBuildSystem(project_repos='vaucanson',
   branch=mybranch,
-  extra_configure_args='CC=gcc-3.3 CXX=g++-3.3',
-  install_dir='vaucanson_gcc3')
+  extra_configure_args='CC=icc CXX=icpc --with-boost=/amd/beyrouth/home/lrde/admin/build/local/ --with-xerces=/amd/beyrouth/home/lrde/admin/build/local/ CXXFLAGS=-D_GLIBCXX_GTHREAD_USE_WEAK=0 MORE_DISTCHECK_CONFIGURE_FLAGS=CXXFLAGS=-D_GLIBCXX_GTHREAD_USE_WEAK=0',
+  install_dir='vaucanson_icc',
+  install_cmd=None,
+  dist_cmd=None,
+  upload_cmd=None)
builder_vaucanson_macppc = {'name': 'powerpc-apple-darwin8-gcc-4.0.1',
                           'slavename': 'bot-macppc',
@@ -120,17 +135,23 @@
                           'builddir': 'vaucanson_linux_gcc4_enst',
                           'factory': f_vaucanson_unix
                          }
-builder_vaucanson_linux_gcc3 = {'name': 'i486-linux-gnu-gcc-3.3',
+builder_vaucanson_linux_icc = {'name': 'i486-linux-gnu-icc-10.1',
                           'slavename': 'bot-linux-gcc3',
-                          'builddir': 'vaucanson_linux_gcc3',
-                          'factory': f_vaucanson_unix_gcc3
+                                'builddir': 'vaucanson_linux_icc',
+                                'factory': f_vaucanson_unix_icc
+                               }
+builder_vaucanson_64 = {'name': 'x86-64-linux-gcc-4.1',
+                        'slavename': 'bot-64',
+                        'builddir': 'vaucanson_64',
+                        'factory': f_vaucanson_unix_64
                          }
c['builders'] = [
                  builder_vaucanson_macppc,
-                 builder_vaucanson_linux_gcc3,
+                 builder_vaucanson_linux_icc,
                  builder_vaucanson_linux_gcc4,
                  builder_vaucanson_linux_gcc4_enst,
+                 builder_vaucanson_64
                 ]
####### STATUS TARGETS
Index: trunk/buildbot/masters/buildfactory.py
===================================================================
--- trunk/buildbot/masters/buildfactory.py	(revision 488)
+++ trunk/buildbot/masters/buildfactory.py	(revision 489)
@@ -244,13 +244,10 @@
         else:
             self.post_install_cmd = None
-        self.distcheck_configure_args = distcheck_configure_args
+#        self.distcheck_configure_args = distcheck_configure_args
         if distcheck_cmd == "":
-            self.distcheck_cmd = '''\
-make -k distcheck DISTCHECK_CONFIGURE_FLAGS="%s %s %s" VERBOSE=1 \
-  || { rv=$?; chmod -R u+w *-*; exit $rv; }'''\
-  % (self.kernel_args, self.extra_configure_args,
-       self.distcheck_configure_args)
+            self.distcheck_cmd = '''make -k distcheck VERBOSE=1 \
+  || { rv=$?; chmod -R u+w *-*; exit $rv; }'''
         else:
             self.distcheck_cmd = distcheck_cmd
         if self.distcheck_cmd is not None:
Index: trunk/buildbot/masters/buildfarm.sh
===================================================================
--- trunk/buildbot/masters/buildfarm.sh	(revision 488)
+++ trunk/buildbot/masters/buildfarm.sh	(revision 489)
@@ -58,16 +58,16 @@
 case "$1" in
   start | restart)
     for i in $buildmasters; do
-      run buildbot $1 $i
+      run /home/build/bin/buildbot $1 $i
     done
     for i in $periodic_buildmasters; do
-      run buildbot $1 $i
+      run /home/build/bin/buildbot $1 $i
       run sleep $((3000 + RANDOM % 3000))
     done
     ;;
   sighup | stop)
     for i in $buildmasters $periodic_buildmasters; do
-      run buildbot $1 $i
+      run /home/build/bin/buildbot $1 $i
     done
     ;;
   *)
Index: trunk/buildbot/masters/spot_master.cfg
===================================================================
--- trunk/buildbot/masters/spot_master.cfg	(revision 488)
+++ trunk/buildbot/masters/spot_master.cfg	(revision 489)
@@ -65,7 +65,7 @@
                 who = addr[0:addr.find('@')]
                 when = mktime(strptime(m.group(3), "%y/%m/%d %H:%M:%S"))
                 break
-        lines.pop(0)
+	# lines.pop(0)
         # What changed
         files = []
         while lines:
@@ -112,10 +112,10 @@
                                  treeStableTimer=10*60,
                                  # When a change occurs, wait 10 minutes before
                                  # lunching the build.
-                                 builderNames=[
-                                               'powerpc-apple-darwin8-gcc-4.0.1',
+                                 builderNames=['powerpc-apple-darwin8-gcc-4.0.1',
                                                'i486-linux-gnu-gcc-4.1',
-                                               'i486-linux-gnu-gcc-3.4']))
+                                               'i486-linux-gnu-gcc-3.4',
+                                               'x86-64-linux-gnu-gcc-4.1']))
####### BUILDSLAVES
@@ -129,6 +129,7 @@
                BuildSlave('bot-macppc', '!j<L%Q2@xb|zha'),
                BuildSlave('bot-linux-gcc3', 'Y#j:6:3"Ep1_vV'),
                BuildSlave('bot-linux-gcc4', ':.(cW/W!sh5#X]'),
+	       BuildSlave('bot-64', '!j<W/W!xb|zha')
                ]
####### BUILDERS
@@ -153,9 +154,9 @@
builders = []
 from buildfactory import GNUBuildSystem
-from buildbot.steps.source import CVS
-checkout = CVS(cvsroot='anonymous@minium.lip6.fr:/Volumes/CVS/repository/spot',
-               cvsmodule='spot')
+from buildbot.steps.source import Git
+
+checkout = Git(repourl='http://lrde.epita.fr/~adl/git/spot.git/')
f_spot_unix = GNUBuildSystem(project_repos='spot',
   scm_step=checkout,
@@ -195,11 +196,17 @@
                           'builddir': 'spot_linux_gcc3',
                           'factory': f_spot_unix_gcc3
                          }
+builder_spot_64 = {'name': 'x86-64-linux-gnu-gcc-4.1',
+                          'slavename': 'bot-64',
+                          'builddir': 'spot_64',
+                          'factory': f_spot_unix
+                  }
c['builders'] = [
                  builder_spot_macppc,
                  builder_spot_linux_gcc3,
                  builder_spot_linux_gcc4,
+	         builder_spot_64,
                 ]
####### STATUS TARGETS

    