[GNUnet-SVN] r18536 - gnunet-planetlab/config_generator

[gnunet]

Author: pritpal
Date: 2011-12-09 17:26:53 +0100 (Fri, 09 Dec 2011)
New Revision: 18536

Modified:
   gnunet-planetlab/config_generator/master_template.cfg
Log:
modified

Modified: gnunet-planetlab/config_generator/master_template.cfg
===================================================================
--- gnunet-planetlab/config_generator/master_template.cfg       2011-12-09 
16:26:42 UTC (rev 18535)
+++ gnunet-planetlab/config_generator/master_template.cfg       2011-12-09 
16:26:53 UTC (rev 18536)
@@ -20,9 +20,37 @@
 # a 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'] =  
-               [
-               replace1
+c['slaves'] =  [
+
+replace1
+#              BuildSlave("gnuslave", "gnupasswd"),
+#              BuildSlave("grothoff-jaunty-arm", "callmetheplug"),
+#              BuildSlave("grothoff-lenny-powerpc", 
"1f5d5c50a430f933c425988a18a107af"),
+#              BuildSlave("wachs-lenny-sparc64", "netintumwachs"),
+#              BuildSlave("wachs-freebsd7-amd64", "netintumwachs"),
+#              BuildSlave("wachs-lenny-i386", "netintumwachs"),
+#                BuildSlave("ubuntu-armv71-evans", "evansarmv71"),
+#              BuildSlave("evans-freebsd7-x86", "evans7bsd"),
+#              BuildSlave("evans-freebsd8-x86", "evans8bsd"),
+#              BuildSlave("wachs-lenny-powerpc", 
"cca63c12c457f45aab6a40a6972f216a"),
+#              BuildSlave("ndurner-gtwy", "0e3465253fe833dcf809d5b81b88e614"),
+#              BuildSlave("ndurner-xp", "43384b4710805db05979406dd8ce39b9"),
+#              BuildSlave("amatus-freebsd32", 
"d41d8cd98f00b204e9800998ecf8427e"),
+#              BuildSlave("amatus-freebsd64", 
"d41d8cd98f00b204e9800998ecf8427e"),
+#              BuildSlave("daniel-sid-amd64", "SBJh3ag0ushAfXGjNo7"),
+#              BuildSlave("daniel-sid-i386", "SBJh3ag0ushAfXGjNo7"),
+#              BuildSlave("daniel-sid-powerpc", "SBJh3ag0ushAfXGjNo7"),
+#               BuildSlave("daniel-lenny-amd64", "SBJh3ag0ushAfXGjNo7"),
+#              BuildSlave("daniel-lenny-i386", "SBJh3ag0ushAfXGjNo7"),
+#              BuildSlave("daniel-lenny-powerpc", "SBJh3ag0ushAfXGjNo7"),
+#              BuildSlave("grothoff-intrepid-x86", "flaialya"),
+#              BuildSlave("moep-osx", "40da61ff0f331b9a39c7432d57bed24f"),
+#              BuildSlave("mortuusvir-freebsd-sparc64", 
"8d9ca8815fa4ea0fd9d9b381b40b8eff"),
+#              BuildSlave("safey-tiger-x86", 
"a6892cfd0499ef1aec99aed606296bfa"),
+#              BuildSlave("mortuusvir-tiger-powerpc", 
"N2pyL4pS83L8vZx43uGPUSRJzgtiuWSGwbmfkgz9yiaZ"),
+#               BuildSlave("wachs-openindiana-amd64", 
"7eb43220b5a3947f594da7e6a510096f"),
+#              BuildSlave("wachs-winxp64-amd64", 
"6iyBbWNN3n5Y3lzuyW6Dm/zkPezlLaHjnayS3r30pGjI"),
+#              BuildSlave("lenny-arm-nat","cca6g3c13345a23ab6a40a6972f216a"),
                ]
 
 # to limit to two concurrent builds on a slave, use
@@ -32,7 +60,7 @@
 # 'slavePortnum' defines the TCP port to listen on. This must match the value
 # configured into the buildslaves (with their --master option)
 
-c['slavePortnum'] = 9989
+c['slavePortnum'] = 9991
 
 ####### CHANGESOURCES
 
@@ -74,8 +102,43 @@
                                  treeStableTimer=30*60,
                                 categories=["GNUnet"],
                                  builderNames=[
-                                       replace2
+               
 
+                       replace2
+#                                      "debian-amd64-grothoff",
+#                                      "jaunty-arm-grothoff",
+#                                      "lenny-powerpc-grothoff",
+#                                      "fedora15-x86-grothoff",
+#                                      "lenny-sparc64-wachs",  
+#                                      "wachs-lenny-powerpc",
+#                                      "wachs-lenny-i386",
+#                                      "freebsd7-amd64-wachs",
+#                                      "ubuntu-armv71-evans",
+#                                      "moep-osx"]))
+#                                      "openindiana-amd64-wachs",
+#                                      "freebsd7-x86-evans",
+#                                      "freebsd8-x86-evans",
+#                                      "squeeze-pentium3-ndurner",
+#                                      "windowsxp-x86-ndurner",
+#                                        "freebsd8-sparc64-mortuusvir",
+#                                        "tiger-powerpc-mortuusvir",
+#                                        "tiger-x86-safey",
+#                                      "freebsd7-x86-amatus",
+#                                      "freebsd7-amd64-amatus",
+#                                      "sid-x86-daniel",
+#                                        "sid-amd64-daniel",
+#                                      "sid-powerpc-daniel",
+#                                        "lenny-x86-daniel",
+#                                        "lenny-amd64-daniel",
+#                                        "lenny-powerpc-daniel",
+#                                       "lenny-arm-nat",
+#                                       "gnunet-wachs-winxp64-amd64"]))
+
+#c['schedulers'].append(Scheduler(name="extractor", branch=None,
+#                                 treeStableTimer=30*60,
+#                                 categories=["Extractor"],
+#                                 builderNames=[
+#                                      "extractor-wachs-winxp64-amd64"
 ]))
 
 
@@ -109,63 +172,14 @@
 #rm-nat
 tmp = "/tmp/gnbuild"
 le_tmp = "/tmp/lebuild"
+
 #c['change_source'] = [
 #                      SVNPoller(svnurl = "https://gnunet.org/svn/gnunet/";, 
category="GNUnet"),
 #                      SVNPoller(svnurl = "https://gnunet.org/svn/Extractor/";, 
category="Extractor"),
 #              ]
 
+
 f1 = factory.BuildFactory()
-
-f1.addStep(source.SVN(mode='update', svnurl = 
"https://gnunet.org/svn/gnunet-planetlab/";))
-
-f1.addStep(shell.ShellCommand, command=["sh", "-c", 
"./00_planetlab-certificate-install.sh"],
-       description="Installing svn certificate",
-       name="Install-Certificate gnunet.org",
-       haltOnFailure=True,
-       timeout=30)
-
-
-f1.addStep(shell.ShellCommand, command=["sh", "-c", 
"./00_planetlab-remove.sh"],
-       description="Removing Previous Libcrypt version",
-       name="remove prev-ligcrypt",
-       haltOnFailure=True,
-       timeout=30)
-
-
-f1.addStep(shell.ShellCommand, command=["sh", "-c", 
"./01_planetlab-dependencies.sh"],
-       description="Installing gnunet dependencies",
-       name="install dependencies",
-       haltOnFailure=True,
-       timeout=30)
-
-
-f1.addStep(shell.ShellCommand, command=["sh", "-c", 
"./02_planetlab-deps-from-source.sh"],
-       description="Installing more dependencies",
-       name="install more dependencies",
-       haltOnFailure=True,
-       timeout=30)
-
-
-f1.addStep(shell.ShellCommand, command=["sh", "-c", 
"./03_planetlab-extractor.sh"],
-       description="Installing Extractor",
-       name="install Extractor",
-       haltOnFailure=True,
-       timeout=30)
-
-f1.addStep(shell.ShellCommand, command=["sh", "-c", 
"./04_planetlab-libmicrohttpd.sh"],
-       description="Installing Libmicrohttpd",
-       name="install Libmicrohttpd",
-       haltOnFailure=True,
-       timeout=30)
-
-
-f1.addStep(shell.ShellCommand, command=["sh", "-c", 
"./05_planetlab-gnunet.sh"],
-       description="Installing Gnunet",
-       name="install Gnunet",
-       haltOnFailure=True,
-       timeout=30)
-
-
 f1.addStep(source.SVN(mode='update', svnurl = 
"https://gnunet.org/svn/gnunet/";))
 f1.addStep(shell.ShellCommand, command=["sh", "-c", "killall 
gnunet-service-arm || true; svn -R revert *; rm -rf /tmp/gnunet*; rm -rf 
/tmp/test*;"],
        description="clean up from previous runs",
@@ -1091,16 +1105,169 @@
         usePTY=True,
         command=["sh", "-c", "make check; "])
 
-
 replace3
 
+#b0 = {'name': "debian-amd64-grothoff",
+#      'slavename': "gnuslave",
+#      'builddir': "full",
+#      'factory': f1,
+#      'category': "GNUnet",
+#     }
+#b1 = {'name': "jaunty-arm-grothoff",
+#      'slavename': "grothoff-jaunty-arm",
+#      'builddir': "grothoff-jaunty-arm",
+#      'factory': f1_slow_machines ,
+#      'category': "GNUnet",
+#      }
+#b2 = {'name': "squeeze-pentium3-ndurner",
+#      'slavename': "ndurner-gtwy",
+#      'builddir': "ndurner-gtwy",
+#      'factory': f1,
+#      'category': "GNUnet",
+#     }
+#b3 = {'name': "windowsxp-x86-ndurner",
+#      'slavename': "ndurner-xp",
+#      'builddir': "ndurner-xp",
+#      'factory': f3,
+#      'category': "GNUnet",
+#     }
+#b6 = {'name': "sid-x86-daniel",
+#      'slavename': "daniel-sid-i386",
+#      'builddir': "daniel-sid-i386",
+#      'factory': f1,
+#      'category': "GNUnet",
+#     }
+#b7 = {'name': "sid-amd64-daniel",
+#      'slavename': "daniel-sid-amd64",
+#      'builddir': "daniel-sid-amd64",
+#      'factory': f1,
+#      'category': "GNUnet",
+#     }
+#b8 = {'name': "sid-powerpc-daniel",
+#      'slavename': "daniel-sid-powerpc",
+#      'builddir': "daniel-sid-powerpc",
+#      'factory': f1,
+#      'category': "GNUnet",
+#     }
+#b9 = {'name': "lenny-x86-daniel",
+#      'slavename': "daniel-lenny-i386",
+#      'builddir': "daniel-lenny-i386",
+#      'factory': f1,
+#      'category': "GNUnet",
+#     }
+#b10 = {'name': "lenny-amd64-daniel",
+#      'slavename': "daniel-lenny-amd64",
+#      'builddir': "daniel-lenny-amd64",
+#      'factory': f1,
+#      'category': "GNUnet",
+#     }
+#b11 = {'name': "lenny-powerpc-daniel",
+#      'slavename': "daniel-lenny-powerpc",
+#      'builddir': "daniel-lenny-powerpc",
+#      'factory': f1,
+#      'category': "GNUnet",
+#     }
+#b12 = {'name': "fedora15-x86-grothoff",
+#      'slavename': "grothoff-intrepid-x86",
+#      'builddir': "grothoff-intrepid-x86",
+#      'factory': f1,
+#        'category': "GNUnet",
+#     }
+#b13 = {'name': "freebsd8-sparc64-mortuusvir",
+#      'slavename': "mortuusvir-freebsd-sparc64",
+#      'builddir': "mortuusvir-freebsd-sparc64",
+#      'factory': f2,
+#        'category': "GNUnet",
+#      }
+#b14 = {'name': "tiger-x86-safey",
+#        'slavename': "safey-tiger-x86",
+#      'builddir': "tiger-x86-safey",
+#      'factory': f4,
+#        'category': "GNUnet",
+#      }       
+#b15 = {'name': "tiger-powerpc-mortuusvir",
+#        'slavename': "mortuusvir-tiger-powerpc",
+#        'builddir': "tiger-powerpc-mortuusvir",
+#        'factory': f4,
+#       'category': "GNUnet",
+#      }
+#b17 = {'name': "freebsd7-x86-evans",
+#      'slavename': "evans-freebsd7-x86",
+#      'builddir': "freebsd7-x86-evans",
+#      'factory': f2,
+#        'category': "GNUnet",
+#      }
+#b18 = {'name': "freebsd8-x86-evans",
+#      'slavename' : "evans-freebsd8-x86",
+#      'builddir': "freebsd8-x86-evans",
+#      'factory': f2,
+#       'category': "GNUnet",
+#      }
+#b19 = {'name': "lenny-sparc64-wachs",
+#      'slavename' : "wachs-lenny-sparc64",
+#      'builddir': "lenny-sparc64-wachs",
+#      'factory': f1_slow_machines ,
+#        'category': "GNUnet",
+#      }
+#b20 = {'name': "freebsd7-amd64-wachs",
+#       'slavename' : "wachs-freebsd7-amd64",
+#       'builddir': "freebsd7-amd64-wachs",
+#       'factory': f2,
+#        'category': "GNUnet",
+#      }
+#b21 = {'name': "ubuntu-armv71-evans",
+#      'slavename': "ubuntu-armv71-evans",
+#      'builddir': "ubuntu-armv71-evans",
+#      'factory': f1_slow_machines ,
+#      'category': "GNUnet",
+#      }
+#b22 = {'name': "wachs-lenny-powerpc",
+#      'slavename': "wachs-lenny-powerpc",
+#      'builddir': "wachs-lenny-powerpc",
+#      'factory': f1,
+#      'category': "GNUnet",
+#      }
+#b23 = {'name': "wachs-lenny-i386",
+#      'slavename': "wachs-lenny-i386",
+#      'builddir': "bot",
+#      'factory': f1,
+#      'category': "GNUnet",
+#      }
+#b24 = {'name': "moep-osx",
+#      'slavename': "moep-osx",
+#      'builddir': "moep-osx",
+#      'factory': f_moep,
+#      'category': "GNUnet",
+#      }
+#b_nat = {'name': "lenny-arm-nat",
+#      'slavename': "lenny-arm-nat",
+#      'builddir': "lenny-arm-nat",
+#      'factory': f1,
+#      'category': "GNUnet",
+#      }
+#bGN_XP = {'name': "gnunet-wachs-winxp64-amd64",
+#        'builddir': "gnunet-wachs-winxp64-amd64",
+#       'slavename' : "wachs-winxp64-amd64",
+#        'factory': f3,
+#        'category': "GNUnet",
+#}
+#bLE_XP = {'name': "extractor-wachs-winxp64-amd64",
+#       'slavename' : "wachs-winxp64-amd64",
+#        'builddir': "wachs-winxp64-amd64",
+#      'factory': fLEXP,
+#      'category': "Extractor",
+#}
 
 
+
+#c['builders'] = [b0, b1, b12, b19, b20, b21, b22, b23, b14, b_nat, bGN_XP, 
bLE_XP ]
 c['builders'] = [
-#c['builders'] = [b0, b12, b19, b20, b21, b22, b23, b24]
-               replace4
-               ]
+#b0, b12, b19, b20, b21, b22, b23, b24
 
+replace4
+
+]
+
 ####### STATUS TARGETS
 
 # 'status' is a list of Status Targets. The results of each build will be
@@ -1110,8 +1277,8 @@
 c['status'] = []
 
 from buildbot.status import html
-#c['status'].append(html.WebStatus(http_port=8010))
-c['status'].append(html.WebStatus(http_port=8010, allowForce=True))
+c['status'].append(html.WebStatus(http_port=8012))
+#c['status'].append(html.WebStatus(http_port=8010, allowForce=True))
 
 # from buildbot.status import mail
 # c['status'].append(mail.MailNotifier(fromaddr="address@hidden",
@@ -1162,5 +1329,4 @@
 # with an externally-visible host name which the buildbot cannot figure out
 # without some help.
 
-c['buildbotURL'] = "http://localhost:8010/";
-
+c['buildbotURL'] = "http://gnunet.org:8012/";