[pypy-svn] r58788 - in pypy/build/bot2: . codespeak-html pypybuildbot

Tue Oct 7 19:40:44 CEST 2008

Author: hpk
Date: Tue Oct  7 19:40:44 2008
New Revision: 58788

Added:
   pypy/build/bot2/codespeak-html/
      - copied from r58782, pypy/build/bot2/wyvern-html/
Modified:
   pypy/build/bot2/codespeak-html/index.html
   pypy/build/bot2/master.cfg
   pypy/build/bot2/pypybuildbot/builds.py
   pypy/build/bot2/pypybuildbot/master.py
Log:
(pedronis,hpk)
* run 2.5-merge branch by default for now
* run pypy's own tests nightly and translation+lib-python tests nightly
* have wyvern and cobra as build slaves for starters


Modified: pypy/build/bot2/codespeak-html/index.html
==============================================================================

--- pypy/build/bot2/wyvern-html/index.html	(original)
+++ pypy/build/bot2/codespeak-html/index.html	Tue Oct  7 19:40:44 2008
@@ -6,7 +6,7 @@
 </head>
 
 <body>
-<h1>Welcome to Wyvern's PyPy Buildbot!</h1>
+<h1>Welcome to codespeak's PyPy Buildbot!</h1>
 
 <ul>
   <li>the <a href="summary">Summary Display</a> will give you a 

Modified: pypy/build/bot2/master.cfg
==============================================================================
--- pypy/build/bot2/master.cfg	(original)
+++ pypy/build/bot2/master.cfg	Tue Oct  7 19:40:44 2008
@@ -12,7 +12,7 @@
 
 execfile(os.path.expanduser('~/bot2/pypybuildbot/master.py'))
 
-if socket.gethostname() != "wyvern": # for debugging
+if socket.gethostname() not in ("wyvern", "code0.codespeak.net"): # for debugging
     for builderdict in BuildmasterConfig['builders']:
         builderdict["slavenames"] = ['localhost']
     BuildmasterConfig['buildbotURL'] = "http://localhost:%d/" % (httpPortNumber)

Modified: pypy/build/bot2/pypybuildbot/builds.py
==============================================================================
--- pypy/build/bot2/pypybuildbot/builds.py	(original)
+++ pypy/build/bot2/pypybuildbot/builds.py	Tue Oct  7 19:40:44 2008
@@ -70,7 +70,7 @@
                    "-p.buildbot-sourcedata", "."],
         ))
     factory.addStep(source.SVN(baseURL="http://codespeak.net/svn/pypy/",
-                            defaultBranch="dist"))    
+                            defaultBranch="branch/2.5-merge"))    
 
 
 class PyPyOwnTestFactory(factory.BuildFactory):

Modified: pypy/build/bot2/pypybuildbot/master.py
==============================================================================
--- pypy/build/bot2/pypybuildbot/master.py	(original)
+++ pypy/build/bot2/pypybuildbot/master.py	Tue Oct  7 19:40:44 2008
@@ -31,9 +31,9 @@
     'slavePortnum': slavePortnum,
 
     'change_source': [],
-    'schedulers': [Nightly("nightly",
-                           ["own-linux-x86-32"],
-                           hour=4, minute=45)],   
+    'schedulers': [
+    	Nightly("nightly", ["own-linux-x86-32", "pypy-c-lib-python-linux-x86-32"], hour=4, minute=45),
+    ],   
     'status': [status],
 
     'slaves': [BuildSlave(name, password)
@@ -42,19 +42,19 @@
 
     'builders': [
                   {"name": "own-linux-x86-32",
-                   "slavenames": ["wyvern"],
+                   "slavenames": ["wyvern", "cobra"],
                    "builddir": "own-linux-x86-32",
                    "factory": pypyOwnTestFactory
                   },
                   {"name": "pypy-c-lib-python-linux-x86-32",
-                   "slavenames": ["wyvern"],
+                   "slavenames": ["wyvern", "cobra"],
                    "builddir": "pypy-c-lib-python-linux-x86-32",
                    "factory": pypyTranslatedLibPythonTestFactory
                   },
                   
                 ],
 
-    'buildbotURL': 'http://wyvern.cs.uni-duesseldorf.de:%d/'%(httpPortNumber),
+    'buildbotURL': 'http://codespeak.net:%d/'%(httpPortNumber),
     'projectURL': 'http://codespeak.net/pypy/',
     'projectName': 'PyPy'}
 

