Merge lp://qastaging/~doanac/uci-engine/restish-code-layout into lp://qastaging/uci-engine

Proposed by Andy Doan
Status: Merged
Approved by: Andy Doan
Approved revision: 660
Merged at revision: 664
Proposed branch: lp://qastaging/~doanac/uci-engine/restish-code-layout
Merge into: lp://qastaging/uci-engine
Diff against target: 434 lines (+140/-80)
8 files modified
charms/precise/restish/charm-helpers.yaml (+1/-0)
charms/precise/restish/config.yaml (+0/-10)
charms/precise/restish/hooks/hooks.py (+64/-52)
charms/precise/restish/unit_tests/test_hooks.py (+67/-13)
ci-utils/ci_utils/unit_config.py (+6/-1)
juju-deployer/gatekeeper.yaml.tmpl (+0/-2)
juju-deployer/nf-stats-service.yaml.tmpl (+0/-2)
nf-stats-service/nfss/database.py (+2/-0)
To merge this branch: bzr merge lp://qastaging/~doanac/uci-engine/restish-code-layout
Reviewer Review Type Date Requested Status
Celso Providelo (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+226202@code.qastaging.launchpad.net

Commit message

restish charm: reorganize code layout and improve install logic

This does a couple of things that were hard to do piece by piece. The
change is a bit big but:

The main goal was getting our code to be in its own directory so it
can start to be treated like read-only. We have an idea in the future
of code rollbacks, so this fits in with that model. This now deploys
code to:

 /srv/<service>/code/r<revno>_<sha1>

 and we maintain a symlink to the latest code with:

   /srv/<service>/code/current

While doing this I got rid of all the bzr-branch logic we no longer
use. This reduces complexity.

I'll also converted our tarball logic to use charmhelpers.fetch.

While changing so much, I also decided to improve our code-extraction
logic by moving it to our config-changed logic. This means that
we now have the ability to update code by just changing the payload
value of the service.

Description of the change

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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

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

review: Approve (continuous-integration)
Revision history for this message
Celso Providelo (cprov) wrote :

Looks good and does exactly what we have planned and executed for other components.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches