Ubuntu CI Engine

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

1300347
Merge into trunk

Proposed by Chris Johnston on 2014-03-31

Status:

Merged

Approved by:

Chris Johnston on 2014-03-31

Approved revision:

417

Merged at revision:

417

Proposed branch:

lp://staging/~cjohnston/uci-engine/1300347

Merge into:

lp://staging/uci-engine

Diff against target:

39 lines (+6/-7)

1 file modified

juju-deployer/deploy.py (+6/-7)

To merge this branch:

bzr merge lp://staging/~cjohnston/uci-engine/1300347

Low

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Paul Larson		2014-03-31	Approve on 2014-03-31
PS Jenkins bot (community)	continuous-integration		Approve on 2014-03-31
Review via email: mp+213518@code.staging.launchpad.net

Commit message

Catch DataStore missing/invalid auth info exception

Description of the change

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

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-31:

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)

Revision history for this message

Paul Larson (pwlars) wrote on 2014-03-31:

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?