Merge lp:~cjohnston/ubuntu-ci-services-itself/deployer-missing-ci-utils into lp:ubuntu-ci-services-itself

[Chris Johnston]

Deployer needs ci-utils too

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Andy Doan (doanac)]

review: Approve

=== modified file 'juju-deployer/deploy.py'
--- juju-deployer/deploy.py	2014-02-25 14:23:02 +0000
+++ juju-deployer/deploy.py	2014-02-25 16:42:33 +0000
@@ -13,10 +13,12 @@
 import textwrap
 from distutils import spawn
 from itertools import chain
-from ci_utils import dump_stack
 
 # the juju-deployer/ directory.
 deployer_dir = os.path.abspath(os.path.dirname(sys.argv[0]))
+# ci-utils probably isn't in our pythonpath
+sys.path.append(os.path.join(os.path.dirname(__file__), '../ci-utils'))
+from ci_utils import dump_stack
 
 
 def check_environment():

=== modified file 'tests/run.py'
--- tests/run.py	2014-02-24 19:35:44 +0000
+++ tests/run.py	2014-02-25 16:42:33 +0000
@@ -27,7 +27,6 @@
 
 # deploy.py probably isn't in our pythonpath
 sys.path.append(os.path.join(os.path.dirname(__file__), '../juju-deployer'))
-sys.path.append(os.path.join(os.path.dirname(__file__), '../ci-utils'))
 import deploy