Merge lp:~fginther/ubuntu-ci-services-itself/reduce-polling-times into lp:ubuntu-ci-services-itself

[Francis Ginther]

Reduce lander and bsbuilder poll times from 60 seconds to 10.

Reduce lander and bsbuilder poll times from 60 seconds to 10.

[Chris Johnston (cjohnston)]

review: Approve

=== modified file 'branch-source-builder/bsbuilder/run_worker.py'
--- branch-source-builder/bsbuilder/run_worker.py	2014-03-13 02:41:08 +0000
+++ branch-source-builder/bsbuilder/run_worker.py	2014-03-13 15:16:04 +0000
@@ -28,7 +28,7 @@
 logging.basicConfig(level=logging.INFO)
 log = logging.getLogger(__name__)
 
-TIME_BETWEEN_CHECKS = 60
+TIME_BETWEEN_CHECKS = 10
 
 
 def create_result_file(datastore, content):

=== modified file 'juju-deployer/lander.yaml.tmpl'
--- juju-deployer/lander.yaml.tmpl	2014-03-10 22:25:00 +0000
+++ juju-deployer/lander.yaml.tmpl	2014-03-13 15:16:04 +0000
@@ -41,7 +41,7 @@
                 packages: "python-amqplib python-swiftclient lazr.enum"
                 plugins: "parameterized-trigger:2.14"
                 unit-config: include-base64://configs/unit_config.yaml
-                main: ./run-python ./lander/lander/run_worker.py --service-name ts-django --service-port 8080 --delay 60
+                main: ./run-python ./lander/lander/run_worker.py --service-name ts-django --service-port 8080 --delay 10
         rabbit:
             branch: lp:~canonical-ci-engineering/charms/precise/ubuntu-ci-services-itself/rabbitmq-server@46
             charm: rabbitmq