archive/blender-buildbot
Archived
1
0
Fork 0
Code Issues 3 Pull Requests Projects Releases Wiki Activity

Synchronize changes with server

Browse Source
This commit is contained in:
Sergey Sharybin
2016-06-08 12:14:55 +02:00
parent 4d3da249cd
commit 0b322ef847
3 changed files with 20 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
maintenance/cleanup.sh
View File

@@ -1,16 +1,15 @@
#!/bin/sh #!/bin/sh
ROOT="/data/buildbot-master/" ROOT="/data/buildbot-master/"
DIRS="linux_glibc211_i386_scons DIRS="linux_glibc211_i686_cmake
linux_glibc211_x86_64_scons linux_glibc211_x86_64_cmake
mac_i386_10_6_scons linux_glibc219_i686_cmake
mac_x86_64_10_6_scons linux_glibc219_x86_64_cmake
mingw_win64_scons mac_x86_64_10_6_cmake
uploaded
win32_cmake_vc2013 win32_cmake_vc2013
win32_scons_vc2013
win64_cmake_vc2013 win64_cmake_vc2013
win64_scons_vc2013" win64_cmake_vc2015
uploaded"
for DIR in $DIRS; do for DIR in $DIRS; do
find "${ROOT}/$DIR" -type f -mtime +14 -exec rm -f {} \; find "${ROOT}/$DIR" -type f -mtime +14 -exec rm -f {} \;

39
master.cfg
View File

@@ -4,7 +4,7 @@
# <pep8 compliant> # <pep8 compliant>
# List of the branches being built automatically overnight # 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 # List of the branches available for force build
FORCE_SCHEDULE_BRANCHES = ["master", "gooseberry", "experimental-build"] FORCE_SCHEDULE_BRANCHES = ["master", "gooseberry", "experimental-build"]
@@ -87,14 +87,13 @@ c['change_source'] = GitPoller(
# CODEBASES # 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 = { all_repositories = {
r'git://git.blender.org/blender.git': 'blender', r'git://git.blender.org/blender.git': 'blender',
r'git://git.blender.org/blender-translations.git': 'blender-translations', 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.git': 'blender-addons',
r'git://git.blender.org/blender-addons-contrib.git': 'blender-addons-contrib', 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', 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-translations"),
forcesched.CodebaseParameter(hide=True, codebase="blender-addons"), forcesched.CodebaseParameter(hide=True, codebase="blender-addons"),
forcesched.CodebaseParameter(hide=True, codebase="blender-addons-contrib"), forcesched.CodebaseParameter(hide=True, codebase="blender-addons-contrib"),
forcesched.CodebaseParameter(hide=True, codebase="scons"),
forcesched.CodebaseParameter(hide=True, codebase="lib svn")], forcesched.CodebaseParameter(hide=True, codebase="lib svn")],
properties=[])) properties=[]))
@@ -145,7 +143,6 @@ def schedule_build(name, hour, minute=0):
"blender-translations": {"repository": "", "branch": "master"}, "blender-translations": {"repository": "", "branch": "master"},
"blender-addons": {"repository": "", "branch": "master"}, "blender-addons": {"repository": "", "branch": "master"},
"blender-addons-contrib": {"repository": "", "branch": "master"}, "blender-addons-contrib": {"repository": "", "branch": "master"},
"scons": {"repository": "", "branch": "master"},
"lib svn": {"repository": "", "branch": "trunk"}}, "lib svn": {"repository": "", "branch": "trunk"}},
branch=current_branch, branch=current_branch,
builderNames=[name], builderNames=[name],
@@ -267,8 +264,7 @@ def generic_builder(id, libdir='', branch='', rsync=False):
for submodule in ('blender-translations', for submodule in ('blender-translations',
'blender-addons', 'blender-addons',
'blender-addons-contrib', 'blender-addons-contrib'):
'scons'):
f.addStep(git_submodule_step(submodule)) f.addStep(git_submodule_step(submodule))
f.addStep(git_step(branch)) f.addStep(git_step(branch))
@@ -282,11 +278,6 @@ def generic_builder(id, libdir='', branch='', rsync=False):
descriptionDone='packaged')) descriptionDone='packaged'))
if rsync: if rsync:
f.addStep(rsync_step(id, branch, rsync_script)) 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: else:
f.addStep(FileUpload(name='upload', f.addStep(FileUpload(name='upload',
slavesrc='buildbot_upload.zip', slavesrc='buildbot_upload.zip',
@@ -294,29 +285,21 @@ def generic_builder(id, libdir='', branch='', rsync=False):
maxsize=150 * 1024 * 1024, maxsize=150 * 1024 * 1024,
workdir='install')) workdir='install'))
f.addStep(MasterShellCommand(name='unpack', f.addStep(MasterShellCommand(name='unpack',
command=['python', unpack_script, filename], command=['python2.7', unpack_script, filename],
description='unpacking', description='unpacking',
descriptionDone='unpacked')) descriptionDone='unpacked'))
return f 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_x86_64_10_6_cmake', '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_i686_cmake', '', generic_builder, hour=1)
add_builder(c, 'linux_glibc211_i386_scons', '', generic_builder, hour=1) add_builder(c, 'linux_glibc211_x86_64_cmake', '', generic_builder, hour=2)
add_builder(c, 'linux_glibc211_x86_64_scons', '', generic_builder, hour=2) add_builder(c, 'linux_glibc219_i686_cmake', '', generic_builder, hour=3)
add_builder(c, 'win32_scons_vc2013', 'windows_vc12', generic_builder, hour=1) add_builder(c, 'linux_glibc219_x86_64_cmake', '', generic_builder, hour=4)
add_builder(c, 'win64_scons_vc2013', 'win64_vc12', generic_builder, hour=2)
add_builder(c, 'win32_cmake_vc2013', 'windows_vc12', generic_builder, hour=3) 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, 'win64_cmake_vc2013', 'win64_vc12', generic_builder, hour=4)
#add_builder(c, 'mingw_win32_scons', 'mingw32', generic_builder, hour=4) add_builder(c, 'win64_cmake_vc2015', 'win64_vc14', generic_builder, hour=5)
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)
# STATUS TARGETS # STATUS TARGETS
# #

4
templates/build.html
View File

@@ -50,7 +50,7 @@ SourceStamps:
{% for ss in sourcestamps_row %} {% for ss in sourcestamps_row %}
<div class="col-md-4"> <div class="col-md-4">
<div class="box"> <div class="box">
<h3>{{ ss.codebase }}</h3> <h3>{{ ss }}</h3>
<table class="table table-striped table-hover box"> <table class="table table-striped table-hover box">
{% set ss_class = cycler('alt','') %} {% set ss_class = cycler('alt','') %}
@@ -70,7 +70,7 @@ SourceStamps:
<tr class="{{ ss_class.next() }}"><td>Revision</td><td>{{ ss.revision|revlink(ss.repository) }}</td></tr> <tr class="{{ ss_class.next() }}"><td>Revision</td><td>{{ ss.revision|revlink(ss.repository) }}</td></tr>
{% endif %} {% endif %}
{% if got_revisions[ss.codebase] %} {% if got_revisions[ss] %}
<tr class="{{ ss_class.next() }}"><td>Got Revision</td><td>{{ got_revisions[ss.codebase]|revlink(ss.repository) }}</td></tr> <tr class="{{ ss_class.next() }}"><td>Got Revision</td><td>{{ got_revisions[ss.codebase]|revlink(ss.repository) }}</td></tr>
{% endif %} {% endif %}