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

l 2 buildbot-standalone: build-all -> build-lass

Browse Source
This commit is contained in:
lassulus 2016-06-23 17:48:42 +02:00
parent 271a59b1d6
commit 3d1f3e697d
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,14 +37,14 @@ in {
name="fast-all-branches", name="fast-all-branches",
builderNames=["fast-tests"])) builderNames=["fast-tests"]))
''; '';
build-all-scheduler = '' build-lass-scheduler = ''
# build all lass hosts # build all lass hosts
sched.append(schedulers.SingleBranchScheduler( sched.append(schedulers.SingleBranchScheduler(
## only master ## only master
change_filter=util.ChangeFilter(branch_re="master"), change_filter=util.ChangeFilter(branch_re="master"),
treeStableTimer=10, treeStableTimer=10,
name="prism-master", name="prism-master",
builderNames=["build-all"])) builderNames=["build-lass"]))
''; '';
}; };
builder_pre = '' builder_pre = ''
@ -52,7 +52,7 @@ in {
grab_repo = steps.Git(repourl=stockholm_repo, mode='incremental') grab_repo = steps.Git(repourl=stockholm_repo, mode='incremental')
# TODO: get nixpkgs/stockholm paths from krebs # TODO: get nixpkgs/stockholm paths from krebs
env = { env_lass = {
"LOGNAME": "lass", "LOGNAME": "lass",
"NIX_REMOTE": "daemon", "NIX_REMOTE": "daemon",
"dummy_secrets": "true", "dummy_secrets": "true",
@ -73,12 +73,12 @@ in {
factory.addStep(steps.ShellCommand(**kwargs)) factory.addStep(steps.ShellCommand(**kwargs))
''; '';
builder = { builder = {
build-all = '' build-lass = ''
f = util.BuildFactory() f = util.BuildFactory()
f.addStep(grab_repo) f.addStep(grab_repo)
#TODO: get hosts via krebs #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, addShell(f,name="build-{}".format(i),env=env_lass,
command=nixshell + \ command=nixshell + \
["make \ ["make \
test \ test \
@ -87,7 +87,7 @@ in {
method=build \ method=build \
system={}".format(i)]) system={}".format(i)])
bu.append(util.BuilderConfig(name="build-all", bu.append(util.BuilderConfig(name="build-lass",
slavenames=slavenames, slavenames=slavenames,
factory=f)) factory=f))
@ -96,12 +96,12 @@ in {
f = util.BuildFactory() f = util.BuildFactory()
f.addStep(grab_repo) f.addStep(grab_repo)
for i in [ "prism", "mors", "echelon" ]: for i in [ "prism", "mors", "echelon" ]:
addShell(f,name="populate-{}".format(i),env=env, addShell(f,name="populate-{}".format(i),env=env_lass,
command=nixshell + \ command=nixshell + \
["{}( make system={} eval.config.krebs.build.populate \ ["{}( make system={} eval.config.krebs.build.populate \
| jq -er .)".format("!" if "failing" in i else "",i)]) | jq -er .)".format("!" if "failing" in i else "",i)])
addShell(f,name="build-test-minimal",env=env, addShell(f,name="build-test-minimal",env=env_lass,
command=nixshell + \ command=nixshell + \
["nix-instantiate \ ["nix-instantiate \
--show-trace --eval --strict --json \ --show-trace --eval --strict --json \