summaryrefslogtreecommitdiffstats
path: root/shared/2configs
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2016-01-10 12:34:09 +0100
committerlassulus <lass@aidsballs.de>2016-01-10 12:34:09 +0100
commit9737eeed58e2dfc8e4efcfe1e02dc2f315116e90 (patch)
treee100bcd397d114f470a7ea639a9e6689dee38ebb /shared/2configs
parent3f4cec9196253a72833d7b8e8328227ce665eefe (diff)
parent49b6fd9c87678893ed47794b116660700994b1bc (diff)
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'shared/2configs')
-rw-r--r--shared/2configs/buildbot-standalone.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/shared/2configs/buildbot-standalone.nix b/shared/2configs/buildbot-standalone.nix
index 6ffd7fe8a..3275189a5 100644
--- a/shared/2configs/buildbot-standalone.nix
+++ b/shared/2configs/buildbot-standalone.nix
@@ -30,6 +30,7 @@ in {
# test the master real quick
sched.append(schedulers.SingleBranchScheduler(
change_filter=util.ChangeFilter(branch="master"),
+ treeStableTimer=10, #only test the latest push
name="fast-master-test",
builderNames=["fast-tests"]))
'';
@@ -121,7 +122,7 @@ in {
addShell(s, name="infest-cac-centos7",env=env,
sigtermTime=60, # SIGTERM 1 minute before SIGKILL
- timeout=7200, # 2h
+ timeout=10800, # 3h
command=nixshell + ["infest-cac-centos7"])
bu.append(util.BuilderConfig(name="full-tests",