[pypy-svn] r58380 - in pypy/build/bot2: . pypybuildbot

[pedronis at codespeak.net]

Author: pedronis
Date: Tue Sep 23 15:31:00 2008
New Revision: 58380

Added:
   pypy/build/bot2/pypybuildbot/util.py   (contents, props changed)
   pypy/build/bot2/vitaly_master.cfg
      - copied, changed from r58379, pypy/build/bot2/master.cfg
Modified:
   pypy/build/bot2/master.cfg
   pypy/build/bot2/pypybuildbot/master.py
Log:
(iko, pedronis)

- use a load helper instead of the three lines import/reload/= dance
- reorganize things such that master.py reflects wyvern setups
  while there's still around the vilaly experimental setup on which new stuff can be tried out
  by us



Modified: pypy/build/bot2/master.cfg
==============================================================================
--- pypy/build/bot2/master.cfg	(original)
+++ pypy/build/bot2/master.cfg	Tue Sep 23 15:31:00 2008
@@ -1,13 +1,13 @@
 import sys, os
+# checkout bot2 in the home dir of the master
+sys.path.append(os.path.expanduser('~/bot2/'))
+from pypybuildbot.util import load
 
 slavePortnum =  "tcp:10407"
 httpPortNumber = 8099
 
 # slavename -> password
-import slaveinfo
-reload(slaveinfo)
-passwords = slaveinfo.passwords
+passwords = load('slaveinfo').passwords
+
 
-# checkout bot2 in the home dir of the master
-sys.path.append(os.path.expanduser('~/bot2/'))
 execfile(os.path.expanduser('~/bot2/pypybuildbot/master.py'))

Modified: pypy/build/bot2/pypybuildbot/master.py
==============================================================================
--- pypy/build/bot2/pypybuildbot/master.py	(original)
+++ pypy/build/bot2/pypybuildbot/master.py	Tue Sep 23 15:31:00 2008
@@ -15,9 +15,12 @@
 
 status = WebStatus(httpPortNumber, allowForce=True)
 
-import pypybuildbot.steps
-reload(pypybuildbot.steps)
-pypysteps = pypybuildbot.steps
+# pypy test summary page
+summary = load('pypybuildbot.summary')
+status.putChild('summary', summary.Summary())
+
+
+pypysteps = load('pypybuildbot.steps')
 
 pypyOwnTestFactory = pypysteps.PyPyOwnTestFactory()
 pypyOwnTestFactoryWin = pypysteps.PyPyOwnTestFactory(platform="win32")
@@ -42,13 +45,7 @@
                   },
                 ],
 
-    'buildbotURL': 'http://wyvern.cs.uni-duesseldorf.de:%d/' % (httpPortNumber,),
+    'buildbotURL': 'http://wyvern.cs.uni-duesseldorf.de:%d/'%(httpPortNumber),
     'projectURL': 'http://codespeak.net/pypy/',
     'projectName': 'PyPy'}
 
-import pypybuildbot.summary
-reload(pypybuildbot.summary)
-summary = pypybuildbot.summary
-
-# pypy test summary page
-status.putChild('summary', summary.Summary())

Added: pypy/build/bot2/pypybuildbot/util.py
==============================================================================
--- (empty file)
+++ pypy/build/bot2/pypybuildbot/util.py	Tue Sep 23 15:31:00 2008
@@ -0,0 +1,5 @@
+
+def load(name):
+    mod = __import__(name, {}, {}, ['__all__'])
+    reload(mod)
+    return mod

Copied: pypy/build/bot2/vitaly_master.cfg (from r58379, pypy/build/bot2/master.cfg)
==============================================================================
--- pypy/build/bot2/master.cfg	(original)
+++ pypy/build/bot2/vitaly_master.cfg	Tue Sep 23 15:31:00 2008
@@ -1,13 +1,39 @@
 import sys, os
+# checkout bot2 in the home dir of the master
+sys.path.append(os.path.expanduser('~/bot2/'))
+from pypybuildbot.util import load
 
 slavePortnum =  "tcp:10407"
 httpPortNumber = 8099
 
 # slavename -> password
-import slaveinfo
-reload(slaveinfo)
-passwords = slaveinfo.passwords
+passwords = load('slaveinfo').passwords
+
 
-# checkout bot2 in the home dir of the master
-sys.path.append(os.path.expanduser('~/bot2/'))
 execfile(os.path.expanduser('~/bot2/pypybuildbot/master.py'))
+
+
+# tweaks for vitaly experimental setup
+BuildmasterConfig['schedulers'] = [Nightly("nightly",   
+                                   ["own-linux-x86-32", 
+                                    "own-other-linux-x86-32",
+                                    "own-win-32"], hour=19)]
+
+BuildmasterConfig['builders'] = [
+                  {"name": "own-linux-x86-32",
+                   "slavenames": ["vitaly"],
+                   "builddir": "own-linux-x86-32",
+                   "factory": pypyOwnTestFactory
+                  },
+                  {"name": "own-other-linux-x86-32",
+                   "slavenames": ["fido"],
+                   "builddir": "own-other-linux-x86-32",
+                   "factory": pypyOwnTestFactory
+                  },
+                  {"name": "own-win-32",
+                   "slavenames": ['ebgoc'],
+                   "builddir": "own-win-32",
+                   "factory": pypyOwnTestFactoryWin}
+                ]
+
+BuildmasterConfig['buildbotURL'] = 'http://localhost:8099/'