diff options
| author | lassulus <lass@aidsballs.de> | 2016-01-10 12:34:09 +0100 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2016-01-10 12:34:09 +0100 |
| commit | d4a5cc376c60bb34b724e025fd0cbf9280c7fd39 (patch) | |
| tree | a4228a48c2e9320aa6d6e424d86c8e5c8120c596 /shared | |
| parent | 0a0b9dc0b7a35f6cb6b0af5f4511ba1594bd9813 (diff) | |
| parent | cf1c948f48a5e8c46159e984224cd1080da79c17 (diff) | |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'shared')
| -rw-r--r-- | shared/2configs/buildbot-standalone.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/shared/2configs/buildbot-standalone.nix b/shared/2configs/buildbot-standalone.nix index 6ffd7fe..3275189 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", |