From 0b322ef847c2f85b107c7b657a74f90ea1bea9e9 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Wed, 8 Jun 2016 12:14:55 +0200 Subject: [PATCH] Synchronize changes with server --- maintenance/cleanup.sh | 15 +++++++-------- master.cfg | 39 +++++++++++---------------------------- templates/build.html | 4 ++-- 3 files changed, 20 insertions(+), 38 deletions(-) diff --git a/maintenance/cleanup.sh b/maintenance/cleanup.sh index a6f0b61..fede9ea 100755 --- a/maintenance/cleanup.sh +++ b/maintenance/cleanup.sh @@ -1,16 +1,15 @@ #!/bin/sh ROOT="/data/buildbot-master/" -DIRS="linux_glibc211_i386_scons -linux_glibc211_x86_64_scons -mac_i386_10_6_scons -mac_x86_64_10_6_scons -mingw_win64_scons -uploaded +DIRS="linux_glibc211_i686_cmake +linux_glibc211_x86_64_cmake +linux_glibc219_i686_cmake +linux_glibc219_x86_64_cmake +mac_x86_64_10_6_cmake win32_cmake_vc2013 -win32_scons_vc2013 win64_cmake_vc2013 -win64_scons_vc2013" +win64_cmake_vc2015 +uploaded" for DIR in $DIRS; do find "${ROOT}/$DIR" -type f -mtime +14 -exec rm -f {} \; diff --git a/master.cfg b/master.cfg index 026d5e4..8bd2335 100644 --- a/master.cfg +++ b/master.cfg @@ -4,7 +4,7 @@ # # List of the branches being built automatically overnight -NIGHT_SCHEDULE_BRANCHES = [None, "gooseberry"] +NIGHT_SCHEDULE_BRANCHES = [None] # List of the branches available for force build FORCE_SCHEDULE_BRANCHES = ["master", "gooseberry", "experimental-build"] @@ -87,14 +87,13 @@ c['change_source'] = GitPoller( # CODEBASES # -# Allow to controll separately things like branches for each repo and submodules. +# Allow to control 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', r'https://svn.blender.org/svnroot/bf-blender/': 'lib svn', } @@ -129,7 +128,6 @@ def schedule_force_build(name): 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"), forcesched.CodebaseParameter(hide=True, codebase="lib svn")], properties=[])) @@ -145,7 +143,6 @@ def schedule_build(name, hour, minute=0): "blender-translations": {"repository": "", "branch": "master"}, "blender-addons": {"repository": "", "branch": "master"}, "blender-addons-contrib": {"repository": "", "branch": "master"}, - "scons": {"repository": "", "branch": "master"}, "lib svn": {"repository": "", "branch": "trunk"}}, branch=current_branch, builderNames=[name], @@ -267,8 +264,7 @@ def generic_builder(id, libdir='', branch='', rsync=False): for submodule in ('blender-translations', 'blender-addons', - 'blender-addons-contrib', - 'scons'): + 'blender-addons-contrib'): f.addStep(git_submodule_step(submodule)) f.addStep(git_step(branch)) @@ -282,11 +278,6 @@ def generic_builder(id, libdir='', branch='', rsync=False): descriptionDone='packaged')) if rsync: f.addStep(rsync_step(id, branch, rsync_script)) - elif id.find('cmake') != -1: - f.addStep(FileUpload(name='upload', - slavesrc='buildbot_upload.zip', - masterdest=filename, - maxsize=150 * 1024 * 1024)) else: f.addStep(FileUpload(name='upload', slavesrc='buildbot_upload.zip', @@ -294,29 +285,21 @@ def generic_builder(id, libdir='', branch='', rsync=False): maxsize=150 * 1024 * 1024, workdir='install')) f.addStep(MasterShellCommand(name='unpack', - command=['python', unpack_script, filename], + command=['python2.7', unpack_script, filename], description='unpacking', descriptionDone='unpacked')) return f -# builders +# Builders -add_builder(c, 'mac_x86_64_10_6_scons', 'darwin-9.x.universal', generic_builder, hour=5) -add_builder(c, 'mac_i386_10_6_scons', 'darwin-9.x.universal', generic_builder, hour=11) -add_builder(c, 'linux_glibc211_i386_scons', '', generic_builder, hour=1) -add_builder(c, 'linux_glibc211_x86_64_scons', '', generic_builder, hour=2) -add_builder(c, 'win32_scons_vc2013', 'windows_vc12', generic_builder, hour=1) -add_builder(c, 'win64_scons_vc2013', 'win64_vc12', generic_builder, hour=2) +add_builder(c, 'mac_x86_64_10_6_cmake', 'darwin-9.x.universal', generic_builder, hour=5) +add_builder(c, 'linux_glibc211_i686_cmake', '', generic_builder, hour=1) +add_builder(c, 'linux_glibc211_x86_64_cmake', '', generic_builder, hour=2) +add_builder(c, 'linux_glibc219_i686_cmake', '', generic_builder, hour=3) +add_builder(c, 'linux_glibc219_x86_64_cmake', '', generic_builder, hour=4) add_builder(c, 'win32_cmake_vc2013', 'windows_vc12', generic_builder, hour=3) add_builder(c, 'win64_cmake_vc2013', 'win64_vc12', generic_builder, hour=4) -#add_builder(c, 'mingw_win32_scons', 'mingw32', generic_builder, hour=4) -add_builder(c, 'mingw_win64_scons', 'mingw64', generic_builder, hour=3) -#add_builder(c, 'freebsd_i386_cmake', '', generic_builder, hour=1) -#add_builder(c, 'freebsd_x86_64_cmake', '', generic_builder, hour=2) - -# Multiview branch -add_builder(c, 'multiview_win64_scons', 'win64', generic_builder, 'multiview', hour=4) -add_builder(c, 'multiview_win32_scons', 'windows', generic_builder, 'multiview', hour=5) +add_builder(c, 'win64_cmake_vc2015', 'win64_vc14', generic_builder, hour=5) # STATUS TARGETS # diff --git a/templates/build.html b/templates/build.html index 38889d6..5a80533 100644 --- a/templates/build.html +++ b/templates/build.html @@ -50,7 +50,7 @@ SourceStamps: {% for ss in sourcestamps_row %}
-

{{ ss.codebase }}

+

{{ ss }}

{% set ss_class = cycler('alt','') %} @@ -70,7 +70,7 @@ SourceStamps: {% endif %} - {% if got_revisions[ss.codebase] %} + {% if got_revisions[ss] %} {% endif %}
Revision{{ ss.revision|revlink(ss.repository) }}
Got Revision{{ got_revisions[ss.codebase]|revlink(ss.repository) }}