Merge lp://staging/~ubuntu-managed-branches/ubuntu-system-image/251-0u1 into lp://staging/~ubuntu-managed-branches/ubuntu-system-image/system-image
Status: | Needs review |
---|---|
Proposed branch: | lp://staging/~ubuntu-managed-branches/ubuntu-system-image/251-0u1 |
Merge into: | lp://staging/~ubuntu-managed-branches/ubuntu-system-image/system-image |
Diff against target: |
2373 lines (+960/-412) 34 files modified
MANIFEST.in (+1/-1) NEWS.rst (+15/-1) PKG-INFO (+1/-1) cli-manpage.rst (+7/-2) coverage.ini (+2/-0) dbus-manpage.rst (+2/-2) debian/README.Debian (+13/-0) debian/changelog (+20/-0) ini-manpage.rst (+2/-2) system_image.egg-info/PKG-INFO (+1/-1) system_image.egg-info/SOURCES.txt (+3/-1) systemimage/config.py (+15/-0) systemimage/download.py (+12/-4) systemimage/helpers.py (+11/-18) systemimage/index.py (+1/-4) systemimage/main.py (+12/-1) systemimage/scores.py (+29/-13) systemimage/state.py (+4/-1) systemimage/testing/controller.py (+7/-5) systemimage/testing/helpers.py (+10/-0) systemimage/testing/service.py (+8/-0) systemimage/tests/data/index_22.json (+2/-3) systemimage/tests/data/index_26.json (+245/-0) systemimage/tests/test_candidates.py (+16/-24) systemimage/tests/test_config.py (+35/-0) systemimage/tests/test_helpers.py (+51/-43) systemimage/tests/test_index.py (+0/-42) systemimage/tests/test_main.py (+209/-195) systemimage/tests/test_scores.py (+83/-10) systemimage/tests/test_state.py (+130/-36) systemimage/tests/test_winner.py (+1/-1) systemimage/version.txt (+1/-1) tools/runme.sh (+10/-0) tox.ini (+1/-0) |
To merge this branch: | bzr merge lp://staging/~ubuntu-managed-branches/ubuntu-system-image/251-0u1 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu CI managed package branches | Pending | ||
Review via email: mp+240034@code.staging.launchpad.net |
Commit message
LP: #1383539 - fixes to phased updates for rtm.
Description of the change
system-image (2.5.1-0ubuntu1) UNRELEASED; urgency=medium
* New upstream release.
- LP: #1383539 - Make phased upgrade percentage calculation idempotent
for each tuple of (channel, target-
modify the candidate upgrade path selection process such that if the
lowest scored candidate path has a phased percentage greater than the
device's percentage, the candidate will be ignored, and the next
lowest scored candidate will be checked until either a winner is found
or no candidates are left, in which case the device is deemed to be
up-to-date.
- system-image-cli options -p/--percentage were added to allow command
line override of the device's phased percentage.
- system-image-cli --dry-run now also displays the phase percentage of the
winning candidate upgrade path.
-- Barry Warsaw <email address hidden> Wed, 29 Oct 2014 14:31:18 -0400
Unmerged revisions
- 241. By Barry Warsaw
-
* New upstream release.
- LP: #1383539 - Make phased upgrade percentage calculation idempotent
for each tuple of (channel, target-build-number, machine-id). Also,
modify the candidate upgrade path selection process such that if the
lowest scored candidate path has a phased percentage greater than the
device's percentage, the candidate will be ignored, and the next
lowest scored candidate will be checked until either a winner is found
or no candidates are left, in which case the device is deemed to be
up-to-date.
- system-image-cli options -p/--percentage were added to allow command
line override of the device's phased percentage.
- system-image-cli --dry-run now also displays the phase percentage of the
winning candidate upgrade path.
* debian/README. Debian: Added to explain how to build the source package
if you get hit by a stupid setuptools bug.