diff options
| author | makefu <github@syntax-fehler.de> | 2017-07-31 19:29:03 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2017-07-31 19:29:03 +0200 |
| commit | 681042eedf2dbad2f999dec5cf43a018c52f2d7d (patch) | |
| tree | 0d96f8e60624f8037a1280834e47a586e71ef403 /krebs/3modules/ci.nix | |
| parent | adace5302f92fa8e41d7c3d1fde62623328a4633 (diff) | |
| parent | 47abe1c1a28eda6d8bb90d49356ded7e0341f1ea (diff) | |
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'krebs/3modules/ci.nix')
| -rw-r--r-- | krebs/3modules/ci.nix | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/krebs/3modules/ci.nix b/krebs/3modules/ci.nix index 6e4db6edd..71e7d4aeb 100644 --- a/krebs/3modules/ci.nix +++ b/krebs/3modules/ci.nix @@ -8,12 +8,17 @@ in { options.krebs.ci = { enable = mkEnableOption "krebs continous integration"; + treeStableTimer = mkOption { + type = types.int; + default = 10; + description = "how long to wait until we test changes (in minutes)"; + }; users = mkOption { type = with types; attrsOf (submodule { options = { all = mkOption { type = bool; - default = true; + default = false; }; hosts = mkOption { type = listOf str; @@ -48,9 +53,6 @@ in }; }; - nix.gc.automatic = true; - nix.gc.dates = "05:23"; - krebs.buildbot.master = { slaves = { testslave = "lasspass"; @@ -72,7 +74,7 @@ in sched.append( schedulers.SingleBranchScheduler( change_filter=util.ChangeFilter(branch_re=".*"), - treeStableTimer=10, + treeStableTimer=${toString cfg.treeStableTimer}*60, name="build-all-branches", builderNames=[ "build-hosts" @@ -122,7 +124,8 @@ in "--force-populate", "--target=$LOGNAME@${config.krebs.build.host.name}$HOME/{}".format(user), ]) - ] + ], + timeout=90001 ) ${let |