Merge lp://qastaging/~adam-collard/landscape-charm/install-sources-keys into lp://qastaging/~landscape/landscape-charm/trunk

Proposed by Adam Collard
Status: Merged
Approved by: Simon Poirier
Approved revision: 397
Merged at revision: 395
Proposed branch: lp://qastaging/~adam-collard/landscape-charm/install-sources-keys
Merge into: lp://qastaging/~landscape/landscape-charm/trunk
Diff against target: 278 lines (+93/-17)
11 files modified
Makefile (+1/-1)
config.yaml (+24/-1)
dev/ubuntu-deps (+2/-1)
lib/apt.py (+18/-1)
lib/callbacks/tests/test_apt.py (+1/-1)
lib/tests/stubs.py (+8/-1)
lib/tests/test_apt.py (+34/-6)
lib/tests/test_install.py (+1/-1)
lib/tests/test_services.py (+1/-1)
lib/tests/test_upgrade.py (+1/-1)
tests/helpers.py (+2/-2)
To merge this branch: bzr merge lp://qastaging/~adam-collard/landscape-charm/install-sources-keys
Reviewer Review Type Date Requested Status
Simon Poirier (community) Approve
🤖 Landscape Builder test results Approve
Review via email: mp+361892@code.qastaging.launchpad.net

Commit message

Add support for the harmonised configuration keys for setting sources.list: install_sources, install_keys.

Description of the change

Integration tests pass modulo a test for update_security_db.sh cron job which we can look into separately.

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 :
review: Approve (test results)
394. By Adam Collard

Noop change

395. By Adam Collard

Merge from trunk

396. By Adam Collard

392 alive again

397. By Adam Collard

393 alive again

Revision history for this message
🤖 Landscape Builder (landscape-builder) :
review: Abstain (executing tests)
Revision history for this message
🤖 Landscape Builder (landscape-builder) wrote :
review: Approve (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 :
review: Approve (test results)
Revision history for this message
Simon Poirier (simpoir) wrote :

+1 LGTM.

Also bundletester is a pain to get working nowadays

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