DockerLatenBuildSlave: Set build_wait_timeout to 0 to better reflect …

…documentation
buildbot · Nov 18, 2014 · c3650b9 · c3650b9
1 parent 5d81f5c
commit c3650b9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/master/buildbot/buildslave/docker.py b/master/buildbot/buildslave/docker.py
@@ -38,7 +38,7 @@ class DockerLatentBuildSlave(AbstractLatentBuildSlave):
 
     def __init__(self, name, password, docker_host, image=None, command=None,
                  max_builds=None, notify_on_missing=None,
-                 missing_timeout=(60 * 20), build_wait_timeout=(60 * 10),
+                 missing_timeout=(60 * 20), build_wait_timeout=0,
                  properties={}, locks=None, volumes=None, dockerfile=None,
                  version=None):
 

diff --git a/master/docs/manual/cfg-buildslaves-docker.rst b/master/docs/manual/cfg-buildslaves-docker.rst
@@ -6,7 +6,9 @@ Docker latent BuildSlave
 ========================
 
 Docker_ is an open-source project that automates the deployment of applications inside software containers.
-Using the Docker latent BuildSlave, a fresh image will be instantiated upon each build, assuring consistency of the environment between builds.
+Using the Docker latent BuildSlave, an attempt is made at instantiating a fresh image upon each build, assuring consistency of the environment between builds.
+Each image will be discarded once the slave finished processing the build queue (i.e. becomes ``idle``).
+See :ref:`build_wait_timeout <Common-Latent-Buildslaves-Options>` to change this behavior.
 
 This document will guide you through the setup of such slaves.
 

diff --git a/master/docs/manual/cfg-buildslaves.rst b/master/docs/manual/cfg-buildslaves.rst
@@ -131,6 +131,8 @@ Thanks to services such as Amazon Web Services' Elastic Compute Cloud ("AWS EC2"
 The buildslaves that are started on-demand are called "latent" buildslaves.
 As of this writing, buildbot ships with an abstract base class for building latent buildslaves, and a concrete implementation for AWS EC2 and for libvirt.
 
+.. _Common-Latent-Buildslaves-Options:
+
 Common Options
 ++++++++++++++