Merge lp://staging/~sil2100/ubuntu-system-image/server-per_device_redirect into lp://staging/ubuntu-system-image/server

Proposed by Łukasz Zemczak
Status: Merged
Merged at revision: 291
Proposed branch: lp://staging/~sil2100/ubuntu-system-image/server-per_device_redirect
Merge into: lp://staging/ubuntu-system-image/server
Diff against target: 317 lines (+246/-3)
2 files modified
lib/systemimage/tests/test_tree.py (+175/-0)
lib/systemimage/tree.py (+71/-3)
To merge this branch: bzr merge lp://staging/~sil2100/ubuntu-system-image/server-per_device_redirect
Reviewer Review Type Date Requested Status
Barry Warsaw (community) Approve
Registry Administrators Pending
Review via email: mp+297904@code.staging.launchpad.net

Commit message

Allow adding per-device channel redirects, allowing redirecting single devices out of a channel to a different one - similar to the normal channel redirects. This required some additional care-handling in multiple places.

Description of the change

Allow adding per-device channel redirects, allowing redirecting single devices out of a channel to a different one - similar to the normal channel redirects. This required some additional care-handling in multiple places.

To post a comment you must log in.
Revision history for this message
Barry Warsaw (barry) wrote :

LGTM, though I'd really like to do some real-world testing with a device to make sure that the redirect is doing what it's supposed to do on the phone.

review: Approve
Revision history for this message
Łukasz Zemczak (sil2100) wrote :

Yeah, agreed on that! Will not merge this just yet, will test it locally on a device here first, then I'll deploy in production and do some more testing on a completely detached set of channels.

Revision history for this message
Łukasz Zemczak (sil2100) wrote :

Ok, so I did as many tests as possible locally. Sadly I couldn't do an upgrade-test since I could not force ubuntu-download-manager to accept my local self-signed key (even when using the -self-signed-certs <DIR> parameter). But at least the channels.json modification parts are working and a fresh flash of a channel with the redirected device results in pulling in the right files and channel info (from the target channel).

Merging this in and then proceeding with testing on completely new test-related channels.

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