[vidalia-svn] r4178: Add Polipo to the buildbot config and assign several slaves (in buildbot/trunk: . public_html)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2009-12-12 17:04:15 -0500 (Sat, 12 Dec 2009)
New Revision: 4178

Modified:
   buildbot/trunk/master.cfg
   buildbot/trunk/public_html/index.html
Log:

Add Polipo to the buildbot config and assign several slaves to it.


Modified: buildbot/trunk/master.cfg
===================================================================
--- buildbot/trunk/master.cfg	2009-12-12 10:23:10 UTC (rev 4177)
+++ buildbot/trunk/master.cfg	2009-12-12 22:04:15 UTC (rev 4178)
@@ -161,7 +161,13 @@
 tor_maint_021_msys_factory.addStep(Compile, command=["make"])
 tor_maint_021_msys_factory.addStep(Test, command=["src/or/test", "--debug"])
 
+# Default Polipo build factories
+polipo_master_factory = factory.BuildFactory()
+polipo_master_factory.addStep(Git, repourl="git://git.torproject.org/git/polipo",
+                              branch="master")
+polipo_master_factory.addStep(Compile, command=["make"], env={'EXTRA_DEFINES' : '-Werror'})
 
+
 # Pull the slave passwords from a separate file
 d = {}
 execfile("/home/buildbot/slaves.passwd", d)
@@ -176,7 +182,8 @@
       { 'name' : 'vidalia-trunk',   'factory' : vidalia_default_factory },
       { 'name' : 'vidalia-0.1.x',   'factory' : vidalia_default_factory },
       { 'name' : 'tor-master',      'factory' : tor_master_factory },
-      { 'name' : 'tor-maint-0.2.1', 'factory' : tor_maint_021_factory }
+      { 'name' : 'tor-maint-0.2.1', 'factory' : tor_maint_021_factory },
+      { 'name' : 'polipo-master',   'factory' : polipo_master_factory }
     ]
   },
   { # kore.cs.rpi.edu (Ubuntu 9.04)
@@ -186,7 +193,8 @@
       { 'name' : 'vidalia-trunk',   'factory' : vidalia_default_factory },
       { 'name' : 'vidalia-0.1.x',   'factory' : vidalia_default_factory },
       { 'name' : 'tor-master',      'factory' : tor_master_factory },
-      { 'name' : 'tor-maint-0.2.1', 'factory' : tor_maint_021_factory }
+      { 'name' : 'tor-maint-0.2.1', 'factory' : tor_maint_021_factory },
+      { 'name' : 'polipo-master',   'factory' : polipo_master_factory }
     ]
   },
   {  # kore.cs.rpi.edu (Windows XP)
@@ -204,7 +212,8 @@
       { 'name' : 'vidalia-trunk',   'factory' : vidalia_default_factory },
       { 'name' : 'vidalia-0.1.x',   'factory' : vidalia_default_factory },
       { 'name' : 'tor-master',      'factory' : tor_master_factory },
-      { 'name' : 'tor-maint-0.2.1', 'factory' : tor_maint_021_factory }
+      { 'name' : 'tor-maint-0.2.1', 'factory' : tor_maint_021_factory },
+      { 'name' : 'polipo-master',   'factory' : polipo_master_factory }
     ]
   },
   { # kore.cs.rpi.edu (FreeBSD 7.1)
@@ -214,7 +223,8 @@
       { 'name' : 'vidalia-trunk',   'factory' : vidalia_default_factory },
       { 'name' : 'vidalia-0.1.x',   'factory' : vidalia_default_factory },
       { 'name' : 'tor-master',      'factory' : tor_master_factory },
-      { 'name' : 'tor-maint-0.2.1', 'factory' : tor_maint_021_factory }
+      { 'name' : 'tor-maint-0.2.1', 'factory' : tor_maint_021_factory },
+      { 'name' : 'polipo-master',   'factory' : polipo_master_factory }
     ]
   },
   { # kore.cs.rpi.edu (Windows Vista)
@@ -240,7 +250,8 @@
       { 'name' : 'vidalia-trunk',   'factory' : vidalia_default_factory },
       { 'name' : 'vidalia-0.1.x',   'factory' : vidalia_default_factory },
       { 'name' : 'tor-master',      'factory' : tor_master_factory },
-      { 'name' : 'tor-maint-0.2.1', 'factory' : tor_maint_021_factory }
+      { 'name' : 'tor-maint-0.2.1', 'factory' : tor_maint_021_factory },
+      { 'name' : 'polipo-master',   'factory' : polipo_master_factory }
     ]
   },
   { # phobos (OS X Panther PPC)
@@ -250,7 +261,8 @@
       { 'name' : 'vidalia-trunk',   'factory' : vidalia_default_factory },
       { 'name' : 'vidalia-0.1.x',   'factory' : vidalia_default_factory },
       { 'name' : 'tor-master',      'factory' : tor_master_factory },
-      { 'name' : 'tor-maint-0.2.1', 'factory' : tor_maint_021_factory }
+      { 'name' : 'tor-maint-0.2.1', 'factory' : tor_maint_021_factory },
+      { 'name' : 'polipo-master',   'factory' : polipo_master_factory }
     ]
   }
 #  { # coderman's PS3
@@ -314,7 +326,17 @@
                                 periodicBuildTimer=4*60*60,
                                 builderNames=tor_021_builders))
 
+polipo_master_builders = branch_builder_names('polipo-master', buildslaves)
+c['schedulers'].append(Scheduler(name="tor-master",
+                                 branch="master",
+                                 treeStableTimer=30,
+                                 builderNames=polipo_master_builders))
 
+c['schedulers'].append(Periodic(name="periodic-polipo-master",
+                                branch="master",
+                                periodicBuildTimer=1*60*60,
+                                builderNames=polipo_master_builders))
+
 ####### STATUS TARGETS
 # 'status' is a list of Status Targets. The results of each build will be
 # pushed to these targets. buildbot/status/*.py has a variety to choose from,

Modified: buildbot/trunk/public_html/index.html
===================================================================
--- buildbot/trunk/public_html/index.html	2009-12-12 10:23:10 UTC (rev 4177)
+++ buildbot/trunk/public_html/index.html	2009-12-12 22:04:15 UTC (rev 4178)
@@ -7,8 +7,9 @@
 </head>
 
 <body>
-<h1>Welcome to the <a href="https://www.torproject.org/";>Tor</a> and
-<a href="https://www.torproject.org/vidalia/";>Vidalia</a> buildbot!</h1>
+<h1>Welcome to the <a href="https://www.torproject.org/vidalia/";>Vidalia</a>,
+<a href="https://www.torproject.org/";>Tor</a> and
+<a href="http://www.pps.jussieu.fr/~jch/software/polipo/";>Polipo</a> buildbot!</h1>
 
 <ul>
   <li>The <a href="waterfall">Waterfall Display</a> will give you a