diff options
| author | lassulus <lass@aidsballs.de> | 2016-06-25 11:01:56 +0200 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2016-06-25 11:01:56 +0200 |
| commit | 7089eea04132c062fb9e3b4fe53f09542238e6e9 (patch) | |
| tree | 3eaa66ed0c9402d887751172c5e432cb154aa9d2 /lass | |
| parent | 43a8f0977526d48057d0da64e26ff9ae5a0a11a4 (diff) | |
l 2 buildbot: merge build-lass and build-makefu
Diffstat (limited to 'lass')
| -rw-r--r-- | lass/2configs/buildbot-standalone.nix | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/lass/2configs/buildbot-standalone.nix b/lass/2configs/buildbot-standalone.nix index 46d50faa..04bdcf9d 100644 --- a/lass/2configs/buildbot-standalone.nix +++ b/lass/2configs/buildbot-standalone.nix @@ -43,7 +43,7 @@ in { change_filter=util.ChangeFilter(branch_re=".*"), treeStableTimer=10, name="prism-all-branches", - builderNames=["build-lass", "build-makefu"])) + builderNames=["build-all"])) ''; }; builder_pre = '' @@ -77,10 +77,9 @@ in { factory.addStep(steps.ShellCommand(**kwargs)) ''; builder = { - build-lass = '' + build-all = '' f = util.BuildFactory() f.addStep(grab_repo) - #TODO: get hosts via krebs for i in [ "mors", "uriel", "shodan", "helios", "cloudkrebs", "echelon", "dishfire", "prism" ]: addShell(f,name="build-{}".format(i),env=env_lass, command=nixshell + \ @@ -91,15 +90,6 @@ in { method=build \ 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" ]: addShell(f,name="build-{}".format(i),env=env_makefu, command=nixshell + \ @@ -110,11 +100,12 @@ in { method=build \ system={}".format(i)]) - bu.append(util.BuilderConfig(name="build-makefu", + bu.append(util.BuilderConfig(name="build-all", slavenames=slavenames, factory=f)) ''; + fast-tests = '' f = util.BuildFactory() f.addStep(grab_repo) |