Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

l 2 buildbot: merge build-lass and build-makefu

Browse Source
This commit is contained in:
lassulus 2016-06-25 11:01:56 +02:00
parent 43a8f09775
commit 7089eea041
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lass/2configs/buildbot-standalone.nix
View File

@ -43,7 +43,7 @@ in {
change_filter=util.ChangeFilter(branch_re=".*"), change_filter=util.ChangeFilter(branch_re=".*"),
treeStableTimer=10, treeStableTimer=10,
name="prism-all-branches", name="prism-all-branches",
builderNames=["build-lass", "build-makefu"])) builderNames=["build-all"]))
''; '';
}; };
builder_pre = '' builder_pre = ''
@ -77,10 +77,9 @@ in {
factory.addStep(steps.ShellCommand(**kwargs)) factory.addStep(steps.ShellCommand(**kwargs))
''; '';
builder = { builder = {
build-lass = '' build-all = ''
f = util.BuildFactory() f = util.BuildFactory()
f.addStep(grab_repo) f.addStep(grab_repo)
#TODO: get hosts via krebs
for i in [ "mors", "uriel", "shodan", "helios", "cloudkrebs", "echelon", "dishfire", "prism" ]: for i in [ "mors", "uriel", "shodan", "helios", "cloudkrebs", "echelon", "dishfire", "prism" ]:
addShell(f,name="build-{}".format(i),env=env_lass, addShell(f,name="build-{}".format(i),env=env_lass,
command=nixshell + \ command=nixshell + \
@ -91,15 +90,6 @@ in {
method=build \ method=build \
system={}".format(i)]) system={}".format(i)])
bu.append(util.BuilderConfig(name="build-lass",
slavenames=slavenames,
factory=f))
'';
build-makefu = ''
f = util.BuildFactory()
f.addStep(grab_repo)
#TODO: get hosts via krebs
for i in [ "pornocauster", "wry" ]: for i in [ "pornocauster", "wry" ]:
addShell(f,name="build-{}".format(i),env=env_makefu, addShell(f,name="build-{}".format(i),env=env_makefu,
command=nixshell + \ command=nixshell + \
@ -110,11 +100,12 @@ in {
method=build \ method=build \
system={}".format(i)]) system={}".format(i)])
bu.append(util.BuilderConfig(name="build-makefu", bu.append(util.BuilderConfig(name="build-all",
slavenames=slavenames, slavenames=slavenames,
factory=f)) factory=f))
''; '';
fast-tests = '' fast-tests = ''
f = util.BuildFactory() f = util.BuildFactory()
f.addStep(grab_repo) f.addStep(grab_repo)