Merge lp://staging/~bjornt/landscape-client-charm/update-source into lp://staging/landscape-client-charm
| Status: | Merged |
|---|---|
| Approved by: | Björn Tillenius |
| Approved revision: | 71 |
| Merged at revision: | 64 |
| Proposed branch: | lp://staging/~bjornt/landscape-client-charm/update-source |
| Merge into: | lp://staging/landscape-client-charm |
| Diff against target: |
426 lines (+209/-37) 4 files modified
hooks/hooks.py (+13/-6) hooks/install.py (+18/-19) hooks/stubs.py (+81/-0) hooks/test_hooks.py (+97/-12) |
| To merge this branch: | bzr merge lp://staging/~bjornt/landscape-client-charm/update-source |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| 🤖 Landscape Builder | test results | Approve | |
| Free Ekanayaka (community) | Approve | ||
| Alberto Donato | Approve | ||
|
Review via email:
|
|||
Commit message
Add the new origin/source and upgrade landscape-client if the origin is
changed after the deploy.
Before origin was read only during the install hook, and we ignored any
changes to it after that.
Description of the change
Add the new origin/source and upgrade landscape-client if the origin is
changed after the deploy.
Before origin was read only during the install hook, and we ignored any
changes to it after that.
Most of the changes made are related to testing. I had to copy some
stubs from another charm and pass then along the hooks. It's not ideal,
but it's hard to make it better at this point.
I also removed the use of JujuBroker from the hooks I modified, since
that was written before charmhelpers existed.
Testing instructions:
juju deploy ubuntu
juju deploy --series xenial ./
juju add-relation ubuntu landscape-client
Wait for ubuntu and landscape-client to be deployed
(landscape-
Optionally: juju config landscape-client account-
juju config landscape-client origin=
Confirm that the 17.02 version of landscape-client has been
installed on the unit.
| 🤖 Landscape Builder (landscape-builder) | # |
| 🤖 Landscape Builder (landscape-builder) wrote | # |
| 🤖 Landscape Builder (landscape-builder) wrote | # |
| 🤖 Landscape Builder (landscape-builder) | # |
| 🤖 Landscape Builder (landscape-builder) wrote | # |
Command: make ci-test
Result: Success
Revno: 67
Branch: lp:~bjornt/landscape-client-charm/update-source
Jenkins: https:/