Buildbot: copy master.cfg from builder.blender.org

Seems this file went out of sync with actual file on the server
This commit is contained in:
Sergey Sharybin
2012-10-28 16:40:31 +00:00
parent 656b884387
commit b980b43e66

View File

@@ -28,8 +28,8 @@ c['slavePortnum'] = 9989
from buildbot.changes.svnpoller import SVNPoller from buildbot.changes.svnpoller import SVNPoller
c['change_source'] = SVNPoller( c['change_source'] = SVNPoller(
'https://svn.blender.org/svnroot/bf-blender/trunk/', 'https://svn.blender.org/svnroot/bf-blender/trunk/',
pollinterval=1200) pollinterval=1200)
# BUILDERS # BUILDERS
# #
@@ -53,7 +53,7 @@ c['builders'] = []
buildernames = [] buildernames = []
def add_builder(c, name, libdir, factory, branch=''): def add_builder(c, name, libdir, factory, branch='', rsync=False):
slavenames = [] slavenames = []
for slave in master_private.slaves: for slave in master_private.slaves:
@@ -61,7 +61,7 @@ def add_builder(c, name, libdir, factory, branch=''):
slavenames.append(slave['name']) slavenames.append(slave['name'])
if len(slavenames) > 0: if len(slavenames) > 0:
f = factory(name, libdir, branch) f = factory(name, libdir, branch, rsync)
c['builders'].append(BuilderConfig(name=name, slavenames=slavenames, factory=f, category='blender')) c['builders'].append(BuilderConfig(name=name, slavenames=slavenames, factory=f, category='blender'))
buildernames.append(name) buildernames.append(name)
@@ -74,15 +74,17 @@ def svn_step(branch=''):
else: else:
return SVN(baseURL='https://svn.blender.org/svnroot/bf-blender/%%BRANCH%%/blender', mode='update', defaultBranch='trunk', workdir='blender') return SVN(baseURL='https://svn.blender.org/svnroot/bf-blender/%%BRANCH%%/blender', mode='update', defaultBranch='trunk', workdir='blender')
def lib_svn_step(dir):
return SVN(name='lib svn', baseURL='https://svn.blender.org/svnroot/bf-blender/%%BRANCH%%/lib/' + dir, mode='update', defaultBranch='trunk', workdir='lib/' + dir)
def lib_svn_step(libdir): def rsync_step(file_from, file_to):
return SVN(name='lib svn', baseURL='https://svn.blender.org/svnroot/bf-blender/%%BRANCH%%/lib/' + libdir, mode='update', defaultBranch='trunk', workdir='lib/' + libdir) return ShellCommand(name='rsync', command=['rsync', '-v', '-P', file_from, 'brecht@builder.blender.org:/data/buildbot-master/' + file_to], haltOnFailure=True, description=['rsync'])
# generic builder # generic builder
def generic_builder(idname, libdir='', branch=''): def generic_builder(id, libdir='', branch='', rsync=False):
filename = 'buildbot_upload_' + idname + '.zip' filename = 'buildbot_upload_' + id + '.zip'
compile_script = '../blender/build_files/buildbot/slave_compile.py' compile_script = '../blender/build_files/buildbot/slave_compile.py'
test_script = '../blender/build_files/buildbot/slave_test.py' test_script = '../blender/build_files/buildbot/slave_test.py'
pack_script = '../blender/build_files/buildbot/slave_pack.py' pack_script = '../blender/build_files/buildbot/slave_pack.py'
@@ -93,10 +95,12 @@ def generic_builder(idname, libdir='', branch=''):
if libdir != '': if libdir != '':
f.addStep(lib_svn_step(libdir)) f.addStep(lib_svn_step(libdir))
f.addStep(Compile(command=['python', compile_script, idname])) f.addStep(Compile(command=['python', compile_script, id]))
f.addStep(Test(command=['python', test_script, idname])) f.addStep(Test(command=['python', test_script, id]))
f.addStep(ShellCommand(name='package', command=['python', pack_script, idname, branch], description='packaging', descriptionDone='packaged')) f.addStep(ShellCommand(name='package', command=['python', pack_script, id, branch], description='packaging', descriptionDone='packaged'))
if 'cmake' in idname: if rsync:
f.addStep(rsync_step('../install/buildbot_upload.zip', filename))
elif id.find('cmake') != -1:
f.addStep(FileUpload(name='upload', slavesrc='buildbot_upload.zip', masterdest=filename, maxsize=100 * 1024 * 1024)) f.addStep(FileUpload(name='upload', slavesrc='buildbot_upload.zip', masterdest=filename, maxsize=100 * 1024 * 1024))
else: else:
f.addStep(FileUpload(name='upload', slavesrc='buildbot_upload.zip', masterdest=filename, maxsize=100 * 1024 * 1024, workdir='install')) f.addStep(FileUpload(name='upload', slavesrc='buildbot_upload.zip', masterdest=filename, maxsize=100 * 1024 * 1024, workdir='install'))
@@ -105,20 +109,20 @@ def generic_builder(idname, libdir='', branch=''):
# builders # builders
add_builder(c, 'mac_x86_64_scons', 'darwin-9.x.universal', generic_builder) add_builder(c, 'mac_x86_64_scons', '', generic_builder)
add_builder(c, 'salad_mac_x86_64_scons', 'darwin-9.x.universal', generic_builder, 'soc-2011-salad') #add_builder(c, 'salad_mac_x86_64_scons', 'darwin-9.x.universal', generic_builder, 'soc-2011-salad')
add_builder(c, 'mac_i386_scons', 'darwin-9.x.universal', generic_builder) add_builder(c, 'mac_i386_scons', 'darwin-9.x.universal', generic_builder)
add_builder(c, 'mac_ppc_scons', 'darwin-9.x.universal', generic_builder) add_builder(c, 'mac_ppc_scons', 'darwin-9.x.universal', generic_builder)
#add_builder(c, 'linux_x86_64_cmake', '', generic_builder) #add_builder(c, 'linux_x86_64_cmake', '', generic_builder)
add_builder(c, 'linux_i386_scons', '', generic_builder) add_builder(c, 'linux_i386_scons', '', generic_builder)
add_builder(c, 'salad_linux_i386_scons', '', generic_builder, 'soc-2011-salad') #add_builder(c, 'salad_linux_i386_scons', '', generic_builder, 'soc-2011-salad')
add_builder(c, 'linux_x86_64_scons', '', generic_builder) add_builder(c, 'linux_x86_64_scons', '', generic_builder)
add_builder(c, 'salad_linux_x86_64_scons', '', generic_builder, 'soc-2011-salad') #add_builder(c, 'salad_linux_x86_64_scons', '', generic_builder, 'soc-2011-salad')
add_builder(c, 'win32_scons', 'windows', generic_builder) add_builder(c, 'win32_scons', 'windows', generic_builder)
add_builder(c, 'salad_win32_scons', 'windows', generic_builder, 'soc-2011-salad') #add_builder(c, 'salad_win32_scons', 'windows', generic_builder, 'soc-2011-salad')
add_builder(c, 'win64_scons', 'win64', generic_builder) add_builder(c, 'win64_scons', 'win64', generic_builder)
add_builder(c, 'mingw_win64_scons', 'mingw64', generic_builder)
add_builder(c, 'mingw_win32_scons', 'mingw32', generic_builder) add_builder(c, 'mingw_win32_scons', 'mingw32', generic_builder)
add_builder(c, 'mingw_win64_scons', 'mingw64', generic_builder)
#add_builder(c, 'freebsd_i386_cmake', '', generic_builder) #add_builder(c, 'freebsd_i386_cmake', '', generic_builder)
#add_builder(c, 'freebsd_x86_64_cmake', '', generic_builder) #add_builder(c, 'freebsd_x86_64_cmake', '', generic_builder)
@@ -137,11 +141,19 @@ c['schedulers'] = []
# builderNames=buildernames, # builderNames=buildernames,
# periodicBuildTimer=24*60*60)) # periodicBuildTimer=24*60*60))
c['schedulers'].append(timed.Nightly( schedule_cycle = 4
name='nightly',
builderNames=buildernames, for i in range(0, schedule_cycle):
hour=3, names = []
minute=0)) for j in range(0, len(buildernames)):
if j % schedule_cycle == i:
names += [buildernames[j]]
print(names)
c['schedulers'].append(timed.Nightly(name='nightly' + str(i),
builderNames=names,
hour=3+i,
minute=0))
# STATUS TARGETS # STATUS TARGETS
# #
@@ -161,7 +173,7 @@ authz_cfg = authz.Authz(
forceBuild=True, # use this to test your slave once it is set up forceBuild=True, # use this to test your slave once it is set up
forceAllBuilds=False, forceAllBuilds=False,
pingBuilder=False, pingBuilder=False,
stopBuild=False, stopBuild=True,
stopAllBuilds=False, stopAllBuilds=False,
cancelPendingBuild=True, cancelPendingBuild=True,
) )