Merge lp:~psivaa/ubuntu-ci-services-itself/speedup-imagebuild-tr into lp:ubuntu-ci-services-itself

[Para Siva]

Based on the consecutive runs given in https://docs.google.com/a/canonical.com/spreadsheet/ccc?key=0AvOb-Wd__AD8dEhkeGRWUzBnSmZ5SWhOT0RlQ0tyWmc&usp=drive_web#gid=0

In short, Increasing imagebuilder RAM to 4G and making test-runner testbed to use standard.medium improves the timing considerably for bug 1290716.

Note: Increasing the RAM further to 8G did not yield a lot of timing improvement for imagebuilder and hence stopped at 4G.

Based on the consecutive runs given in https://docs.google.com/a/canonical.com/spreadsheet/ccc?key=0AvOb-Wd__AD8dEhkeGRWUzBnSmZ5SWhOT0RlQ0tyWmc&usp=drive_web#gid=0

In short, Increasing imagebuilder RAM to 4G and making test-runner testbed to use standard.medium improves the timing considerably for bug 1290716.

Note: Increasing the RAM further to 8G did not yield a lot of timing improvement for imagebuilder and hence stopped at 4G.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:377
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/401/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/401/rebuild

review: Approve (continuous-integration)

[Chris Johnston (cjohnston)]

review: Approve

=== modified file 'juju-deployer/configs/unit_config.yaml.tmpl'
--- juju-deployer/configs/unit_config.yaml.tmpl	2014-03-12 01:35:01 +0000
+++ juju-deployer/configs/unit_config.yaml.tmpl	2014-03-13 12:44:20 +0000
@@ -23,4 +23,4 @@
 master_ppa: $CI_MASTER_PPA
 tr_flavors:
     - m1.small
-    - standard.small
+    - standard.medium

=== modified file 'juju-deployer/image-builder.yaml.tmpl'
--- juju-deployer/image-builder.yaml.tmpl	2014-03-10 22:25:00 +0000
+++ juju-deployer/image-builder.yaml.tmpl	2014-03-13 12:44:20 +0000
@@ -22,7 +22,7 @@
                 wsgi_wsgi_file: imagebuilder.wsgi:app
         imagebuild-worker:
             charm: rabbitmq-worker
-            constraints: "root-disk=8192M"
+            constraints: "mem=4096M root-disk=8192M"
             options:
                 main: ./run-python ./image-builder/imagebuilder/run_worker.py
                 vcs: ${CI_CODE_SOURCE}