Merge lp:~cjohnston/uci-engine/1300347 into lp:uci-engine

[Chris Johnston]

Catch DataStore missing/invalid auth info exception

Missing/invalid auth info exception was not caught in the deploy.py code

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Paul Larson (pwlars)]

17 - base = os.path.join(os.path.dirname(__file__), '..')
18 print('Preparing local branch upload...')
19
20 - ciutils = os.path.join(base, 'ci-utils')
This means that we would now have to have a current ci_utils installed in order to run deploy, rather than being able to just deploy from branch right? I really like knowing that when I deploy, I'm using the version of ci-utils that is in the branch I'm working from. Is there a reason why you needed to take this out?

review: Needs Information

[Chris Johnston (cjohnston)]

Isn't the code I removed just duplicating:

http://bazaar.launchpad.net/~cjohnston/uci-engine/1300347/view/head:/juju-deployer/deploy.py#L29

[Paul Larson (pwlars)]

You are correct, I was just looking at the mp rather than the whole file. Thanks! +1

review: Approve

=== modified file 'juju-deployer/deploy.py'
--- juju-deployer/deploy.py	2014-03-27 13:40:30 +0000
+++ juju-deployer/deploy.py	2014-03-31 17:15:43 +0000
@@ -27,7 +27,7 @@
 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
+from ci_utils import dump_stack, data_store
 
 
 # Initialize bzrlib and its plugins
@@ -295,13 +295,8 @@
     Also set the relevant environment variables used to populate the deployer
     scripts and charm configurations.
     """
-    base = os.path.join(os.path.dirname(__file__), '..')
     print('Preparing local branch upload...')
 
-    ciutils = os.path.join(base, 'ci-utils')
-    sys.path.append(ciutils)
-    from ci_utils import data_store
-
     config = {
         'auth_url': os.environ['OS_AUTH_URL'],
         'auth_user': os.environ['OS_USERNAME'],
@@ -309,7 +304,11 @@
         'auth_tenant_name': os.environ['OS_TENANT_NAME'],
         'auth_region': os.environ['OS_REGION_NAME']
     }
-    ds = data_store.DataStore('ci-payload', config, public=True)
+    try:
+        ds = data_store.DataStore('ci-payload', config, public=True)
+    except data_store.DataStoreException as exc:
+        error_msg = ("ERROR: data-store: {}")
+        sys.exit(error_msg.format(exc))
 
     with tempfile.NamedTemporaryFile() as ball:
         fingerprint = build_payload(ball.name)