diff options
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/buildbot/master.cfg | 47 |
1 files changed, 41 insertions, 6 deletions
diff --git a/build_files/buildbot/master.cfg b/build_files/buildbot/master.cfg index ff0c105d68e..2e6663ef06c 100644 --- a/build_files/buildbot/master.cfg +++ b/build_files/buildbot/master.cfg @@ -78,6 +78,25 @@ c['change_source'] = GitPoller( 'git://git.blender.org/blender.git', pollinterval=1200) + +# CODEBASES +# +# Allow to controll separately things like branches for each repo and submodules. + +all_repositories = { + r'git://git.blender.org/blender.git': 'blender', + r'git://git.blender.org/blender-translations.git': 'blender-translations', + r'git://git.blender.org/blender-addons.git': 'blender-addons', + r'git://git.blender.org/blender-addons-contrib.git': 'blender-addons-contrib', + r'git://git.blender.org/scons.git': 'scons', +} + +def codebaseGenerator(chdict): + return all_repositories[chdict['repository']] + +c['codebaseGenerator'] = codebaseGenerator + + # SCHEDULERS # # Decide how to react to incoming changes. @@ -91,16 +110,30 @@ c['schedulers'] = [] def schedule_force_build(name): c['schedulers'].append(forcesched.ForceScheduler(name='force ' + name, builderNames=[name], - branch=forcesched.ChoiceStringParameter(name="branch", choices=["master", "testbuild"], default="master"), - revision=forcesched.FixedParameter(name="revision", default=""), - repository=forcesched.FixedParameter(name="repository", default=""), - project=forcesched.FixedParameter(name="project", default=""), + codebases=[forcesched.CodebaseParameter( + codebase="blender", + branch=forcesched.ChoiceStringParameter( + name="branch", choices=["master", "testbuild"], default="master"), + # Do not hide revision, can be handy! + repository=forcesched.FixedParameter(name="repository", default="", hide=True), + project=forcesched.FixedParameter(name="project", default="", hide=True)), + # For now, hide other codebases. + forcesched.CodebaseParameter(hide=True, codebase="blender-translations"), + forcesched.CodebaseParameter(hide=True, codebase="blender-addons"), + forcesched.CodebaseParameter(hide=True, codebase="blender-addons-contrib"), + forcesched.CodebaseParameter(hide=True, codebase="scons")], properties=[])) def schedule_build(name, hour, minute=0): c['schedulers'].append(timed.Nightly(name='nightly ' + name, - branch=None, # default branch + codebases={ + "blender": {"repository": ""}, + "blender-translations": {"repository": ""}, + "blender-addons": {"repository": ""}, + "blender-addons-contrib": {"repository": ""}, + "scons": {"repository": ""}}, + branch=None, builderNames=[name], hour=hour, minute=minute)) @@ -154,7 +187,7 @@ def git_submodule_step(submodule): return Git(name=submodule + '.git', repourl='git://git.blender.org/' + submodule + '.git', mode='update', - branch='master', + codebase=submodule, workdir=submodule + '.git') @@ -164,12 +197,14 @@ def git_step(branch=''): repourl='git://git.blender.org/blender.git', mode='update', branch=branch, + codebase='blender', workdir='blender.git', submodules=True) else: return Git(name='blender.git', repourl='git://git.blender.org/blender.git', mode='update', + codebase='blender', workdir='blender.git', submodules=True) |