From 2d8d3f364ed4841c89497a7082ad96d6537512cb Mon Sep 17 00:00:00 2001
From: Sergey Sharybin <sergey.vfx@gmail.com>
Date: Tue, 19 Nov 2013 18:52:18 +0600
Subject: Buildbot: update configuration file

Consider this configuration final-1 for the migration,
Linux and OSX slaves seems to be fine, Windows slave
would need some changes from the slave side.
---
 build_files/buildbot/master.cfg | 33 +++++++++++++++++++++++----------
 1 file changed, 23 insertions(+), 10 deletions(-)

(limited to 'build_files/buildbot/master.cfg')

diff --git a/build_files/buildbot/master.cfg b/build_files/buildbot/master.cfg
index 529b4e483b4..220fa08b23a 100644
--- a/build_files/buildbot/master.cfg
+++ b/build_files/buildbot/master.cfg
@@ -26,9 +26,10 @@ c['slavePortnum'] = 9989
 # CHANGE SOURCES
 
 from buildbot.changes.svnpoller import SVNPoller
+from buildbot.changes.gitpoller import GitPoller
 
-c['change_source'] = SVNPoller(
-       'https://svn.blender.org/svnroot/bf-blender/trunk/',
+c['change_source'] = GitPoller(
+       'git://git.blender.org/blender.git',
        pollinterval=1200)
 
 # SCHEDULERS
@@ -70,6 +71,7 @@ for i in range(0, schedule_cycle):
 
 from buildbot.process.factory import BuildFactory
 from buildbot.steps.source import SVN
+from buildbot.steps.source import Git
 from buildbot.steps.shell import ShellCommand
 from buildbot.steps.shell import Compile
 from buildbot.steps.shell import Test
@@ -100,12 +102,18 @@ def add_builder(c, name, libdir, factory, branch='', rsync=False, hour=3, minute
 
 # common steps
 
+def git_submodule_step(submodule):
+    return Git(name=submodule+'.git', repourl='git://git.blender.org/' + submodule + '.git', mode='update', workdir=submodule + '.git')
 
-def svn_step(branch=''):
+def git_step(branch=''):
     if branch:
-        return SVN(baseURL='https://svn.blender.org/svnroot/bf-blender/branches/%%BRANCH%%', mode='update', defaultBranch=branch, workdir='blender')
+        return Git(name='blender.git', repourl='git://git.blender.org/blender.git', mode='update', branch=branch, workdir='blender.git', submodules=True)
     else:
-        return SVN(baseURL='https://svn.blender.org/svnroot/bf-blender/%%BRANCH%%/blender', mode='update', defaultBranch='trunk', workdir='blender')
+        return Git(name='blender.git', repourl='git://git.blender.org/blender.git', mode='update', workdir='blender.git', submodules=True)
+
+def git_submodules_update():
+    command = ['git', 'submodule', 'foreach', '--recursive', 'git', 'pull', 'origin', 'master']
+    return ShellCommand(name='Submodules Update', command=command, description='updating', descriptionDone='up to date', workdir='blender.git')
 
 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)
@@ -118,14 +126,17 @@ def rsync_step(id, branch, rsync_script):
 
 def generic_builder(id, libdir='', branch='', rsync=False):
     filename = 'uploaded/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'
-    rsync_script = '../blender/build_files/buildbot/slave_rsync.py'
+    compile_script = '../blender.git/build_files/buildbot/slave_compile.py'
+    test_script = '../blender.git/build_files/buildbot/slave_test.py'
+    pack_script = '../blender.git/build_files/buildbot/slave_pack.py'
+    rsync_script = '../blender.git/build_files/buildbot/slave_rsync.py'
     unpack_script = 'master_unpack.py'
 
     f = BuildFactory()
-    f.addStep(svn_step(branch))
+    for submodule in ('blender-translations', 'blender-addons', 'blender-addons-contrib', 'scons'):
+        f.addStep(git_submodule_step(submodule))
+    f.addStep(git_step(branch))
+    f.addStep(git_submodules_update())
     if libdir != '':
         f.addStep(lib_svn_step(libdir))
 
@@ -149,6 +160,8 @@ 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', 'windows', generic_builder, hour=1)
 add_builder(c, 'win64_scons', 'win64', generic_builder, hour=2)
+add_builder(c, 'win32_scons_vc2012', 'windows_vc11', generic_builder, hour=1)
+add_builder(c, 'win64_scons_vc2012', 'win64_vc11', generic_builder, hour=2)
 #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)
-- 
cgit v1.2.3