Landscape Charm

Merge lp://qastaging/~tribaal/landscape-charm/hold-landscape-packages into lp://qastaging/~landscape/landscape-charm/trunk

hold-landscape-packages
Merge into trunk

Proposed by Chris Glass on 2015-12-18

Status:	Merged
Merged at revision:	341
Proposed branch:	lp://qastaging/~tribaal/landscape-charm/hold-landscape-packages
Merge into:	lp://qastaging/~landscape/landscape-charm/trunk
Diff against target:	336 lines (+126/-19) 10 files modified lib/apt.py (+23/-2) lib/install.py (+1/-0) lib/tests/test_apt.py (+31/-5) lib/tests/test_install.py (+11/-0) lib/tests/test_services.py (+9/-6) lib/tests/test_upgrade.py (+27/-4) lib/upgrade.py (+2/-0) lib/utils.py (+7/-0) tests/basic/test_service.py (+8/-0) tests/helpers.py (+7/-2)
To merge this branch:	bzr merge lp://qastaging/~tribaal/landscape-charm/hold-landscape-packages
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Björn Tillenius (community)			Approve on 2016-01-13
🤖 Landscape Builder	test results		Needs Fixing on 2016-01-13
Alberto Donato (community)		2015-12-18	Approve on 2015-12-21
Review via email: mp+280977@code.qastaging.launchpad.net

Description of the change

This branch makes the charm mark the landscape packages as held to prevent automatic upgrades.

Revision history for this message

🤖 Landscape Builder (landscape-builder) wrote on 2015-12-18:

Command: make ci-test
Result: Fail
Revno: 343
Branch: lp:~tribaal/landscape-charm/hold-landscape-packages
Jenkins: https://ci.lscape.net/job/latch-test/3099/

review: Needs Fixing (test results)

lp://qastaging/~tribaal/landscape-charm/hold-landscape-packages updated on 2015-12-18

344. By Chris Glass on 2015-12-18: Don't hardcode the landscape unit's name.

Revision history for this message

🤖 Landscape Builder (landscape-builder) wrote on 2015-12-18:

Command: make ci-test
Result: Fail
Revno: 344
Branch: lp:~tribaal/landscape-charm/hold-landscape-packages
Jenkins: https://ci.lscape.net/job/latch-test/3101/

review: Needs Fixing (test results)

Revision history for this message

Alberto Donato (ack) on 2015-12-21:

Revision history for this message

Alberto Donato (ack) wrote on 2015-12-21:

Code looks good, but I'd move the logic about packages to hold to HoldPackages (see inline).

review: Needs Fixing

lp://qastaging/~tribaal/landscape-charm/hold-landscape-packages updated on 2015-12-21

345. By Chris Glass on 2015-12-21: address review comments

Revision history for this message

🤖 Landscape Builder (landscape-builder) wrote on 2015-12-21:

Command: make ci-test
Result: Fail
Revno: 345
Branch: lp:~tribaal/landscape-charm/hold-landscape-packages
Jenkins: https://ci.lscape.net/job/latch-test/3113/

review: Needs Fixing (test results)

Revision history for this message

Alberto Donato (ack) wrote on 2015-12-21:

Nice! +1

Thanks for addressing the comments. Just a couple nitpicks inline.

review: Approve

Revision history for this message

🤖 Landscape Builder (landscape-builder) wrote on 2015-12-26:

Command: make ci-test
Result: Fail
Revno: 345
Branch: lp:~tribaal/landscape-charm/hold-landscape-packages
Jenkins: https://ci.lscape.net/job/latch-test/3116/

review: Needs Fixing (test results)

lp://qastaging/~tribaal/landscape-charm/hold-landscape-packages updated on 2016-01-04

346. By Chris Glass on 2016-01-04: Addressed review comments.

Revision history for this message

🤖 Landscape Builder (landscape-builder) wrote on 2016-01-04:

Command: make ci-test
Result: Fail
Revno: 346
Branch: lp:~tribaal/landscape-charm/hold-landscape-packages
Jenkins: https://ci.lscape.net/job/latch-test/3118/

review: Needs Fixing (test results)

Revision history for this message

Björn Tillenius (bjornt) wrote on 2016-01-04:

Looks good except for some minor issues. I don't quite see how it will work for upgrades, though. It might work, but maybe not. It's hard to add a test for it, but could you at least test it manually before landing the branch? Make sure that there's actually an upgrade available and see whether the packages are still held after the upgrade.

review: Approve

lp://qastaging/~tribaal/landscape-charm/hold-landscape-packages updated on 2016-01-04

347. By Chris Glass on 2016-01-04: Typo fix.

Revision history for this message

Chris Glass (tribaal) on 2016-01-04:

Revision history for this message

🤖 Landscape Builder (landscape-builder) wrote on 2016-01-04:

Command: make ci-test
Result: Fail
Revno: 347
Branch: lp:~tribaal/landscape-charm/hold-landscape-packages
Jenkins: https://ci.lscape.net/job/latch-test/3120/

review: Needs Fixing (test results)

Revision history for this message

Chris Glass (tribaal) wrote on 2016-01-07:

I'm going to revert some of the changes proposed to my initial suggestion, since we need to compute the same logic for the install step: we need to explicitly install packages we intent to mark as well, otherwise upgrades don't work.

lp://qastaging/~tribaal/landscape-charm/hold-landscape-packages updated on 2016-01-07

348. By Chris Glass on 2016-01-07: Revert changes to initial proposal
349. By Chris Glass on 2016-01-07: Fixed typoes.
350. By Chris Glass on 2016-01-07: Reverting to the right revision this time.
351. By Chris Glass on 2016-01-07: Fixed typoes
352. By Chris Glass on 2016-01-07: Re-did the single call work as per comments. Fixed tests.