landscape-client-charm

Merge lp://staging/~adam-collard/landscape-client-charm/install_sources_keys into lp://staging/landscape-client-charm

  1. install_sources_keys
  2. Merge into trunk
Proposed by Adam Collard
Status: Merged
Approved by: Adam Collard
Approved revision: 71
Merged at revision: 68
Proposed branch: lp://staging/~adam-collard/landscape-client-charm/install_sources_keys
Merge into: lp://staging/landscape-client-charm
Diff against target: 391 lines (+86/-70)
10 files modified
Makefile (+9/-1)
TESTING (+3/-1)
config.yaml (+21/-0)
dev/ubuntu-deps (+1/-5)
hooks/common.py (+4/-1)
hooks/hooks.py (+7/-5)
hooks/install.py (+14/-49)
hooks/stubs.py (+6/-0)
hooks/test_hooks.py (+20/-7)
tests/10-deploy-register.py (+1/-1)
To merge this branch: bzr merge lp://staging/~adam-collard/landscape-client-charm/install_sources_keys
Reviewer Review Type Date Requested Status
Simon Poirier (community) Approve
🤖 Landscape Builder test results Approve
Review via email: mp+365452@code.staging.launchpad.net

Commit message

Add install_sources and install_keys support to landscape-client charm

To post a comment you must log in.
Revision history for this message
🤖 Landscape Builder (landscape-builder) :
review: Abstain (executing tests)
Revision history for this message
🤖 Landscape Builder (landscape-builder) wrote :

Command: make ci-test
Result: Fail
Revno: 69
Branch: lp:~adam-collard/landscape-client-charm/install_sources_keys
Jenkins: https://ci.lscape.net/job/latch-test-trusty/1703/

review: Needs Fixing (test results)
Revision history for this message
🤖 Landscape Builder (landscape-builder) :
review: Abstain (executing tests)
Revision history for this message
🤖 Landscape Builder (landscape-builder) wrote :

Command: make ci-test
Result: Fail
Revno: 69
Branch: lp:~adam-collard/landscape-client-charm/install_sources_keys
Jenkins: https://ci.lscape.net/job/latch-test-xenial/3922/

review: Needs Fixing (test results)
lp://staging/~adam-collard/landscape-client-charm/install_sources_keys updated
70. By Adam Collard

Remove sys.path manipulation

Revision history for this message
🤖 Landscape Builder (landscape-builder) :
review: Abstain (executing tests)
Revision history for this message
🤖 Landscape Builder (landscape-builder) wrote :

Command: make ci-test
Result: Success
Revno: 70
Branch: lp:~adam-collard/landscape-client-charm/install_sources_keys
Jenkins: https://ci.lscape.net/job/latch-test-xenial/3923/

review: Approve (test results)
Revision history for this message
Simon Poirier (simpoir) wrote :

A few minor things, inline

review: Needs Fixing
Revision history for this message
Adam Collard (adam-collard) :
lp://staging/~adam-collard/landscape-client-charm/install_sources_keys updated
71. By Adam Collard

Actually obey LANDSCAPE_CLIENT_CHARM_INSTALL_SOURCES, check for changes to origin key too

Review feedback

Revision history for this message
🤖 Landscape Builder (landscape-builder) :
review: Abstain (executing tests)
Revision history for this message
🤖 Landscape Builder (landscape-builder) wrote :

Command: make ci-test
Result: Success
Revno: 71
Branch: lp:~adam-collard/landscape-client-charm/install_sources_keys
Jenkins: https://ci.lscape.net/job/latch-test-xenial/3924/

review: Approve (test results)
Revision history for this message
Simon Poirier (simpoir) wrote :

+1 LGTM

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

to all changes: