Permalink
Browse files

buildbot: try to fix automatic build / cleanup

  • Loading branch information...
abma committed Jan 7, 2016
1 parent 1c76273 commit 0d9eb81cb22286dd1c9109389840373b7e26b03f
Showing with 23 additions and 51 deletions.
  1. +23 −51 buildbot/master.cfg
View
@@ -9,10 +9,6 @@ base_rev = base_rev_major
master_repo = 'git://github.com/springlobby/springlobby.git'
master_repo_rw = 'git@github.com:springlobby/springlobby.git'
active_devs = {
'develop': 'git://github.com/springlobby/springlobby.git'
}
WIN_STRIP="/opt/mingw32/usr/bin/i686-w64-mingw32-strip"
WIN_EXE_DIR="build-msw-default/src/"
@@ -93,38 +89,16 @@ from buildbot.schedulers.basic import AnyBranchScheduler
from buildbot.schedulers.forcesched import ForceScheduler
from buildbot.schedulers import timed
for name in active_devs.keys():
c['schedulers'].append(AnyBranchScheduler(
name="%s_Scheduler"%name,
#change_filter=ChangeFilter(category_re = '.*%s.*'%name),
treeStableTimer=60,
fileIsImportant=changeIsImportant,
builderNames=[name]))
#builderNames=[name,'%s-osx'%name]))
#the osx build is delayed so trivial fails in the default builder may be corrected before it's started
#c['schedulers'].append(Scheduler(
# name="%s-osx_Scheduler"%name,
# change_filter=ChangeFilter(category_re = '.*%s.*'%name),
# fileIsImportant=changeIsImportant,
# treeStableTimer=6*60,
# builderNames=['%s-osx'%name]))
#c['schedulers'].append(timed.Nightly(
# name='nightly_sched',
# branch='master',
# fileIsImportant=changeIsImportant,
# onlyIfChanged=True,
# builderNames=["buildbot-osx" ], hour=5, minute=0))
c['schedulers'].append(AnyBranchScheduler(
name="develop_Scheduler",
#change_filter=ChangeFilter(category_re = '.*develop.*'),
treeStableTimer=60,
fileIsImportant=changeIsImportant,
builderNames=["develop-win"]))
c['schedulers'].append(ForceScheduler(
name='force_sched',
builderNames=["docs", "release", "mxe" ] + ['{}{}'.format(x,f) for (x,f) in itertools.product(active_devs.keys(), ['', '-win_debug', '-win'])] ))
#c['schedulers'].append(AnyBranchScheduler(
# name="full-sched",
# treeStableTimer=60,
# #fileIsImportant=changeIsImportant,
# #change_filter=ChangeFilter(branch_re='develop|release|post_release'),
# builderNames=["develop-win"]))
builderNames=["docs", "release", "mxe", 'develop', 'develop-win_debug', 'develop-win'] ))
####### BUILDERS
@@ -391,7 +365,7 @@ class ReleaseFactory(BuildFactory):
class FullBuildFactory(BuildFactory):
def __init__(self,dude):
BuildFactory.__init__(self)
self.addStep(Git(repourl=active_devs[dude]))
self.addStep(Git(repourl=master_repo))
self.addStep( SyncSubmodules() )
self.addStep( InitSubmodules() )
for name in set(build_configs.keys()) - set(['osx-default']):
@@ -404,7 +378,7 @@ class FullBuildFactory(BuildFactory):
class TestBuildFactory(BuildFactory):
def __init__(self,dude):
BuildFactory.__init__(self)
self.addStep(Git(repourl=active_devs[dude]))
self.addStep(Git(repourl=master_repo))
self.addStep( SyncSubmodules() )
self.addStep( InitSubmodules() )
for env in env_builds:
@@ -414,7 +388,7 @@ class TestBuildFactory(BuildFactory):
class WinTempBuildFactory(BuildFactory):
def __init__(self, who):
BuildFactory.__init__(self)
self.addStep(Git(repourl=active_devs[who]))
self.addStep(Git(repourl=master_repo))
self.addStep( SyncSubmodules() )
self.addStep( InitSubmodules() )
self.addStep( CreateBuildDir('msw-default') )
@@ -424,7 +398,7 @@ class WinTempBuildFactory(BuildFactory):
class WinTempDebugBuildFactory(BuildFactory):
def __init__(self, who):
BuildFactory.__init__(self)
self.addStep(Git(repourl=active_devs[who]))
self.addStep(Git(repourl=master_repo))
self.addStep( SyncSubmodules() )
self.addStep( InitSubmodules() )
self.addStep( CreateBuildDir('msw-debug') )
@@ -434,7 +408,7 @@ class WinTempDebugBuildFactory(BuildFactory):
class OSXBuildFactory(BuildFactory):
def __init__(self, who):
BuildFactory.__init__(self)
self.addStep(Git(repourl=active_devs[who]))
self.addStep(Git(repourl=master_repo))
self.addStep( SyncSubmodules() )
self.addStep( InitSubmodules() )
self.addStep( CreateBuildDir('osx-default') )
@@ -461,29 +435,27 @@ class MXEFactory(BuildFactory):
self.addStep(CompileMXEBuildDir())
win32buildenv = {
'CMAKE': '/home/buildbot/slaves/springlobby/mxe/build/mxe/usr/bin/i686-w64-mingw32.static-cmake',
'CMAKE_PARAMS': '-DCMAKE_STRIP:PATH=/home/buildbot/slaves/springlobby/mxe/build/mxe/usr/bin/i686-w64-mingw32.static-strip'
}
for name in active_devs.keys():
c['builders'].append({'name': name,
c['builders'].append({'name': 'develop',
'slavenames': ["release-slave"],
'builddir': name,
'factory': FullBuildFactory(name)
'builddir': "develop",
'factory': FullBuildFactory("develop")
})
c['builders'].append({'name': name+'-win',
c['builders'].append({'name': 'develop-win',
'slavenames': ["release-slave"],
'builddir': name+'-win',
'factory': WinTempBuildFactory(name),
'builddir': 'develop-win',
'factory': WinTempBuildFactory("develop"),
'env': win32buildenv
})
c['builders'].append({'name': name+'-win_debug',
c['builders'].append({'name': 'develop-win_debug',
'slavenames': ["release-slave"],
'builddir': name+'-win_debug',
'factory': WinTempDebugBuildFactory(name),
'builddir': 'develop-win_debug',
'factory': WinTempDebugBuildFactory("develop"),
'env': win32buildenv
})

0 comments on commit 0d9eb81

Please sign in to comment.