Skip to content
This repository has been archived by the owner on May 13, 2020. It is now read-only.

Commit

Permalink
change to withcompiler platform setting, reschedule runs
Browse files Browse the repository at this point in the history
  • Loading branch information
Adam Groszer committed Aug 27, 2010
1 parent 31a1ddd commit b15c8cb
Showing 1 changed file with 58 additions and 81 deletions.
139 changes: 58 additions & 81 deletions master.cfg
View file
@@ -1,10 +1,6 @@
# -*- python -*-
# ex: set syntax=python:

############################################################
# this should be a live copy of the master.cfg of the server
############################################################

import re
import time
import sys
Expand Down Expand Up @@ -227,7 +223,7 @@ def makeCleanfactory():
f.treeStableTimer = 300
return f

def setupCleanupBuild(slow_lock):
def setupCleanupBuild(slow_lock, hour=01, minute=01):
c['builders'].append({
'name': 'cleanup',
'slavename': 'local',
Expand All @@ -237,7 +233,7 @@ def setupCleanupBuild(slow_lock):
})

c['schedulers'].append(Nightly(
"Nightly cleanup", ['cleanup'], hour=[01],
"Nightly cleanup", ['cleanup'], hour=hour, minute=minute,
branch="trunk"))

# cleanup
Expand Down Expand Up @@ -292,11 +288,14 @@ def setupEggBuild(slow_lock):
# egg building
######################################


######################################
# platform definitions
class Platform(object):
python = ''
buildout = ''
name = ''
title = ''
withcompiler = ''

def __init__(self, **kw):
for k,v in kw.items():
Expand All @@ -307,84 +306,52 @@ PLATFORMS = dict(
name='py_244_win32',
title='Python 2.4.4 win32',
python=r'c:\Python24_32\python.exe',
buildout=r'bin\buildout.exe'),
withcompiler=r'cmd /c c:\Python24_32\setupcompilerandexecute.bat %s'),
py_254_win32 = Platform(
name='py_254_win32',
title='Python 2.5.4 win32',
python=r'c:\Python25_32\python.exe',
buildout=r'bin\buildout.exe'),
withcompiler=r'cmd /c c:\Python25_32\setupcompilerandexecute.bat %s'),
py_265_win32 = Platform(
name='py_265_win32',
title='Python 2.6.5 win32',
python=r'c:\Python26_32\python.exe',
buildout=r'bin\buildout.exe'),
withcompiler=r'cmd /c c:\Python26_32\setupcompilerandexecute.bat %s'),
py_265_win64 = Platform(
name='py_265_win64',
title='Python 2.6.5 win64',
python=r'c:\Python26_64\python.exe',
buildout=r'bin\buildout.exe'),
withcompiler=r'cmd /c c:\Python26_64\setupcompilerandexecute.bat %s'),
py_270_win32 = Platform(
name='py_270_win32',
title='Python 2.7.0 win32',
python=r'c:\Python27_32\python.exe',
buildout=r'bin\buildout.exe'),
withcompiler=r'cmd /c c:\Python27_32\setupcompilerandexecute.bat %s'),
py_270_win64 = Platform(
name='py_270_win64',
title='Python 2.7.0 win64',
python=r'c:\Python27_64\python.exe',
buildout=r'bin\buildout.exe'),
withcompiler=r'cmd /c c:\Python27_64\setupcompilerandexecute.bat %s'),
)

# platform definitions
######################################

#these python's have the right settings to be able to compile binary eggs
DEV_PLATFORMS = dict(
py_244_win32 = Platform(
name='py_244_win32',
title='Python 2.4.4 win32',
python=r'c:\Python24_32\python.exe',
buildout=r'cmd /c c:\Python24_32\setupcompilerandexecute.bat bin\buildout.exe'),
py_254_win32 = Platform(
name='py_254_win32',
title='Python 2.5.4 win32',
python=r'c:\Python25_32\python.exe',
buildout=r'cmd /c c:\Python25_32\setupcompilerandexecute.bat bin\buildout.exe'),
py_265_win32 = Platform(
name='py_265_win32',
title='Python 2.6.5 win32',
python=r'c:\Python26_32\python.exe',
buildout=r'cmd /c c:\Python26_32\setupcompilerandexecute.bat bin\buildout.exe'),
py_265_win64 = Platform(
name='py_265_win64',
title='Python 2.6.5 win64',
python=r'c:\Python26_64\python.exe',
buildout=r'cmd /c c:\Python26_64\setupcompilerandexecute.bat bin\buildout.exe'),
py_270_win32 = Platform(
name='py_270_win32',
title='Python 2.7.0 win32',
python=r'c:\Python27_32\python.exe',
buildout=r'cmd /c c:\Python27_32\setupcompilerandexecute.bat bin\buildout.exe'),
py_270_win64 = Platform(
name='py_270_win64',
title='Python 2.7.0 win64',
python=r'c:\Python27_64\python.exe',
buildout=r'cmd /c c:\Python27_64\setupcompilerandexecute.bat bin\buildout.exe'),
)
######################################
# ZTK dev/trunk tests

ZTK_DEV_PLATFORMS = DEV_PLATFORMS.copy()
ZTK_DEV_PLATFORMS = PLATFORMS.copy()

del ZTK_DEV_PLATFORMS['py_270_win32']
del ZTK_DEV_PLATFORMS['py_270_win64']

######################################
# ZTK tests

def ztk_dev_builder(name, slavename, platform, locks):
builddir = name.replace(' ', '_')
f = factory.BuildFactory()
f.addStep(SVN(
svnurl="svn://svn.zope.org/repos/main/zopetoolkit/trunk",
haltOnFailure=True,
mode="update"))
mode="copy"))

lc = LastChange()
lc.url_template = 'http://zope3.pov.lt/trac/log/zopetoolkit?rev=%s'
Expand All @@ -406,7 +373,7 @@ def ztk_dev_builder(name, slavename, platform, locks):
name="disable ssh for svn",
description="disable ssh for svn"))
f.addStep(shell.ShellCommand(
command="%s -c development.cfg" % platform.buildout,
command=platform.withcompiler % r"bin\buildout.exe -c development.cfg",
haltOnFailure=True,
name="buildout",
description="buildout",
Expand All @@ -432,9 +399,9 @@ def ztk_dev_builder(name, slavename, platform, locks):
factory=f,
locks=locks)

def setupZTK_dev_tests(slow_lock):
hour = 02
minute = 01
def setupZTK_dev_tests(slow_lock, hour=02, minute=01):
#hour = 02
#minute = 01
builders = []
for pname in sorted(ZTK_DEV_PLATFORMS.keys()):
platform = ZTK_DEV_PLATFORMS[pname]
Expand Down Expand Up @@ -471,7 +438,7 @@ def ztk_10_builder(name, slavename, platform, locks):
f.addStep(SVN(
svnurl="svn://svn.zope.org/repos/main/zopetoolkit/trunk",
haltOnFailure=True,
mode="update"))
mode="copy"))

lc = LastChange()
lc.url_template = 'http://zope3.pov.lt/trac/log/zopetoolkit?rev=%s'
Expand All @@ -488,7 +455,7 @@ def ztk_10_builder(name, slavename, platform, locks):
name="bootstrap",
description="bootstrap"))
f.addStep(shell.ShellCommand(
command="%s" % platform.buildout,
command=r"bin\buildout.exe",
haltOnFailure=True,
name="buildout",
description="buildout",
Expand All @@ -511,9 +478,9 @@ def ztk_10_builder(name, slavename, platform, locks):
factory=f,
locks=locks)

def setupZTK_10_tests(slow_lock):
hour = 02
minute = 10
def setupZTK_10_tests(slow_lock, hour=02, minute=10):
#hour = 02
#minute = 10
builders = []
for pname in sorted(ZTK_10_PLATFORMS.keys()):
platform = ZTK_10_PLATFORMS[pname]
Expand Down Expand Up @@ -558,8 +525,11 @@ def zc_buildout_dev_builder(name, slavename, platform, locks):
# haltOnFailure=True,
# name="virtualenv",
# description="virtualenv"))

#actually bootstrap and buildout in one step
cmd = platform.python + " dev.py"
f.addStep(shell.ShellCommand(
command=[platform.python, r"dev.py"],
command=platform.withcompiler % cmd,
haltOnFailure=True,
name="bootstrap",
description="bootstrap"))
Expand All @@ -569,8 +539,10 @@ def zc_buildout_dev_builder(name, slavename, platform, locks):
# name="buildout",
# description="buildout",
# timeout=3600))
cmd = r"bin\test.exe --exit-with-status -1"
f.addStep(Test(
command=[r"bin\test.exe", "--exit-with-status", "-1"],
#command=[r"bin\test.exe", "--exit-with-status", "-1"],
command=platform.withcompiler % cmd,
haltOnFailure=False,
name="test",
description="test trunk"))
Expand All @@ -580,9 +552,9 @@ def zc_buildout_dev_builder(name, slavename, platform, locks):
factory=f,
locks=locks)

def setup_zc_buildout_dev_tests(slow_lock):
hour = 02
minute = 20
def setup_zc_buildout_dev_tests(slow_lock, hour=02, minute=20):
#hour = 02
#minute = 20
builders = []
for pname in sorted(PLATFORMS.keys()):
platform = PLATFORMS[pname]
Expand Down Expand Up @@ -635,7 +607,7 @@ def bb_builder(name, slavename, platform, locks):
name="bootstrap",
description="bootstrap"))
f.addStep(shell.ShellCommand(
command="cmd /c %s" % platform.buildout,
command=r"bin\buildout.exe",
haltOnFailure=True,
name="buildout",
description="buildout",
Expand All @@ -649,9 +621,9 @@ def bb_builder(name, slavename, platform, locks):
locks=locks)


def setup_BB_dev_tests(slow_lock):
hour = 02
minute = 30
def setup_BB_dev_tests(slow_lock, hour=02, minute=30):
#hour = 02
#minute = 30
builders = []
for pname in sorted(PLATFORMS.keys()):
platform = PLATFORMS[pname]
Expand Down Expand Up @@ -679,7 +651,7 @@ def setup_BB_dev_tests(slow_lock):
######################################
# ZODB

ZODB_DEV_PLATFORMS = DEV_PLATFORMS.copy()
ZODB_DEV_PLATFORMS = PLATFORMS.copy()
del ZODB_DEV_PLATFORMS['py_244_win32']

def ZODB_dev_builder(name, slavename, platform, locks):
Expand All @@ -705,7 +677,7 @@ def ZODB_dev_builder(name, slavename, platform, locks):
name="bootstrap",
description="bootstrap"))
f.addStep(shell.ShellCommand(
command="%s" % platform.buildout,
command=platform.withcompiler % r"bin\buildout.exe",
haltOnFailure=True,
name="buildout",
description="buildout",
Expand All @@ -721,9 +693,9 @@ def ZODB_dev_builder(name, slavename, platform, locks):
factory=f,
locks=locks)

def setup_ZODB_dev_tests(slow_lock):
hour = 02
minute = 40
def setup_ZODB_dev_tests(slow_lock, hour=02, minute=40):
#hour = 02
#minute = 40
builders = []
for pname in sorted(ZODB_DEV_PLATFORMS.keys()):
platform = ZODB_DEV_PLATFORMS[pname]
Expand Down Expand Up @@ -822,14 +794,19 @@ c['schedulers'] = []
c['builders'] = []
c['status'] = []

setupCleanupBuild(slow_lock)
setupCleanupBuild(slow_lock, hour=20, minute=01)

setupEggBuild(slow_lock) #every 30 mins

setupEggBuild(slow_lock)
setupZTK_dev_tests(slow_lock)
setupZTK_10_tests(slow_lock)
setup_zc_buildout_dev_tests(slow_lock)
setup_ZODB_dev_tests(slow_lock)
setup_BB_dev_tests(slow_lock)
#there are at most 6 builds for each project,
#every build is setup on the next minute
#that will never be true, but at least keeps
#the builds nicely sorted
setupZTK_dev_tests(slow_lock, hour=20, minute=10)
setupZTK_10_tests(slow_lock, hour=20, minute=20)
setup_zc_buildout_dev_tests(slow_lock, hour=20, minute=30)
setup_ZODB_dev_tests(slow_lock, hour=20, minute=40)
setup_BB_dev_tests(slow_lock, hour=20, minute=50)


#NO proxy via apache, so it can be kicked locally at least
Expand Down

0 comments on commit b15c8cb

Please sign in to comment.