diff options
Diffstat (limited to 'build_files/buildbot/master.cfg')
| -rw-r--r-- | build_files/buildbot/master.cfg | 61 |
1 files changed, 38 insertions, 23 deletions
diff --git a/build_files/buildbot/master.cfg b/build_files/buildbot/master.cfg index 066c133d335..e9deade6e99 100644 --- a/build_files/buildbot/master.cfg +++ b/build_files/buildbot/master.cfg @@ -53,7 +53,7 @@ c['builders'] = [] buildernames = [] -def add_builder(c, name, libdir, factory, branch=''): +def add_builder(c, name, libdir, factory, branch='', rsync=False): slavenames = [] for slave in master_private.slaves: @@ -61,7 +61,7 @@ def add_builder(c, name, libdir, factory, branch=''): slavenames.append(slave['name']) 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')) buildernames.append(name) @@ -74,15 +74,17 @@ def svn_step(branch=''): else: 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): - return SVN(name='lib svn', baseURL='https://svn.blender.org/svnroot/bf-blender/%%BRANCH%%/lib/' + libdir, mode='update', defaultBranch='trunk', workdir='lib/' + libdir) +def rsync_step(file_from, file_to): + 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 -def generic_builder(idname, libdir='', branch=''): - filename = 'buildbot_upload_' + idname + '.zip' +def generic_builder(id, libdir='', branch='', rsync=False): + filename = 'buildbot_upload_' + id + '.zip' compile_script = '../blender/build_files/buildbot/slave_compile.py' test_script = '../blender/build_files/buildbot/slave_test.py' pack_script = '../blender/build_files/buildbot/slave_pack.py' @@ -93,10 +95,12 @@ def generic_builder(idname, libdir='', branch=''): if libdir != '': f.addStep(lib_svn_step(libdir)) - f.addStep(Compile(command=['python', compile_script, idname])) - f.addStep(Test(command=['python', test_script, idname])) - f.addStep(ShellCommand(name='package', command=['python', pack_script, idname, branch], description='packaging', descriptionDone='packaged')) - if 'cmake' in idname: + f.addStep(Compile(command=['python', compile_script, id])) + f.addStep(Test(command=['python', test_script, id])) + f.addStep(ShellCommand(name='package', command=['python', pack_script, id, branch], description='packaging', descriptionDone='packaged')) + 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)) else: f.addStep(FileUpload(name='upload', slavesrc='buildbot_upload.zip', masterdest=filename, maxsize=100 * 1024 * 1024, workdir='install')) @@ -105,20 +109,22 @@ def generic_builder(idname, libdir='', branch=''): # builders -add_builder(c, 'mac_x86_64_scons', 'darwin-9.x.universal', generic_builder) -add_builder(c, 'salad_mac_x86_64_scons', 'darwin-9.x.universal', generic_builder, 'soc-2011-salad') +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, 'mac_i386_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_i386_scons', '', generic_builder) -add_builder(c, 'salad_linux_i386_scons', '', generic_builder, 'soc-2011-salad') -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, 'linux_glibc27_i386_scons', '', generic_builder) +add_builder(c, 'linux_glibc211_i386_scons', '', generic_builder) +#add_builder(c, 'salad_linux_i386_scons', '', generic_builder, 'soc-2011-salad') +add_builder(c, 'linux_glibc27_x86_64_scons', '', generic_builder) +add_builder(c, 'linux_glibc211_x86_64_scons', '', generic_builder) +#add_builder(c, 'salad_linux_x86_64_scons', '', generic_builder, 'soc-2011-salad') 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, 'mingw_win64_scons', 'mingw64', 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_x86_64_cmake', '', generic_builder) @@ -137,10 +143,19 @@ c['schedulers'] = [] # builderNames=buildernames, # periodicBuildTimer=24*60*60)) -c['schedulers'].append(timed.Nightly(name='nightly', - builderNames=buildernames, - hour=3, - minute=0)) +schedule_cycle = 4 + +for i in range(0, schedule_cycle): + names = [] + 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 # @@ -160,7 +175,7 @@ authz_cfg = authz.Authz( forceBuild=True, # use this to test your slave once it is set up forceAllBuilds=False, pingBuilder=False, - stopBuild=False, + stopBuild=True, stopAllBuilds=False, cancelPendingBuild=True, ) |