summaryrefslogtreecommitdiffstats
path: root/lass/2configs
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2016-11-28 23:24:47 +0100
committerlassulus <lass@aidsballs.de>2016-11-29 13:56:13 +0100
commit5518fcf25a4872bdca797bd830aebe8570aa2915 (patch)
tree5af54b2242c2e53a9bfc19d11434f60e830d121d /lass/2configs
parentd8da51621e44f6577e6d725b6263837cfa70f2bd (diff)
l 2 buildbot: fix indentation
Diffstat (limited to 'lass/2configs')
-rw-r--r--lass/2configs/buildbot-standalone.nix74
1 files changed, 50 insertions, 24 deletions
diff --git a/lass/2configs/buildbot-standalone.nix b/lass/2configs/buildbot-standalone.nix
index e7fbccb77..9ff96089b 100644
--- a/lass/2configs/buildbot-standalone.nix
+++ b/lass/2configs/buildbot-standalone.nix
@@ -18,25 +18,34 @@ in {
};
change_source.stockholm = ''
stockholm_repo = '${stockholm-mirror-url}'
- cs.append(changes.GitPoller(
+ cs.append(
+ changes.GitPoller(
stockholm_repo,
workdir='stockholm-poller', branches=True,
project='stockholm',
- pollinterval=120))
+ pollinterval=120
+ )
+ )
'';
scheduler = {
build-scheduler = ''
# build all hosts
- sched.append(schedulers.SingleBranchScheduler(
- change_filter=util.ChangeFilter(branch_re=".*"),
- treeStableTimer=10,
- name="build-all-branches",
- builderNames=["build-all", "build-pkgs"]))
+ sched.append(
+ schedulers.SingleBranchScheduler(
+ change_filter=util.ChangeFilter(branch_re=".*"),
+ treeStableTimer=10,
+ name="build-all-branches",
+ builderNames=["build-all", "build-pkgs"]
+ )
+ )
'';
};
builder_pre = ''
# prepare grab_repo step for stockholm
- grab_repo = steps.Git(repourl=stockholm_repo, mode='full')
+ grab_repo = steps.Git(
+ repourl=stockholm_repo,
+ mode='full'
+ )
# TODO: get nixpkgs/stockholm paths from krebs
env_lass = {
@@ -57,13 +66,21 @@ in {
# prepare nix-shell
# the dependencies which are used by the test script
- deps = [ "gnumake", "jq", "nix", "(import <stockholm>).pkgs.populate", "openssh" ]
+ deps = [
+ "gnumake",
+ "jq",
+ "nix",
+ "(import <stockholm>).pkgs.populate",
+ "openssh"
+ ]
# TODO: --pure , prepare ENV in nix-shell command:
# SSL_CERT_FILE,LOGNAME,NIX_REMOTE
- nixshell = ["nix-shell",
- "-I", "stockholm=.",
- "-I", "nixpkgs=/var/src/nixpkgs",
- "-p" ] + deps + [ "--run" ]
+ nixshell = [
+ "nix-shell",
+ "-I", "stockholm=.",
+ "-I", "nixpkgs=/var/src/nixpkgs",
+ "-p"
+ ] + deps + [ "--run" ]
# prepare addShell function
def addShell(factory,**kwargs):
@@ -73,29 +90,38 @@ in {
build-all = ''
f = util.BuildFactory()
f.addStep(grab_repo)
+
for i in [ "mors", "uriel", "shodan", "helios", "cloudkrebs", "echelon", "dishfire", "prism" ]:
- addShell(f,name="build-{}".format(i),env=env_lass,
- command=nixshell + \
- ["mkdir -p /tmp/testbuild/$LOGNAME && touch /tmp/testbuild/$LOGNAME/.populate; \
+ addShell(f,name="build-{}".format(i),env=env_lass,
+ command=nixshell + \
+ ["mkdir -p /tmp/testbuild/$LOGNAME && touch /tmp/testbuild/$LOGNAME/.populate; \
make \
test \
target=$LOGNAME@${config.krebs.build.host.name}/tmp/testbuild/$LOGNAME \
method=build \
- system={}".format(i)])
+ system={}".format(i)
+ ]
+ )
for i in [ "x", "wry", "vbob", "wbob", "shoney" ]:
- addShell(f,name="build-{}".format(i),env=env_makefu,
- command=nixshell + \
- ["mkdir -p /tmp/testbuild/$LOGNAME && touch /tmp/testbuild/$LOGNAME/.populate; \
+ addShell(f,name="build-{}".format(i),env=env_makefu,
+ command=nixshell + \
+ ["mkdir -p /tmp/testbuild/$LOGNAME && touch /tmp/testbuild/$LOGNAME/.populate; \
make \
test \
target=$LOGNAME@${config.krebs.build.host.name}/tmp/testbuild/$LOGNAME \
method=build \
- system={}".format(i)])
+ system={}".format(i)
+ ]
+ )
- bu.append(util.BuilderConfig(name="build-all",
- workernames=workernames,
- factory=f))
+ bu.append(
+ util.BuilderConfig(
+ name="build-all",
+ workernames=workernames,
+ factory=f
+ )
+ )
'';