Merge lp://staging/~canonical-platform-qa/ubuntu-ota-tests/remove-si-autopkgtest-workarounds into lp://staging/ubuntu-ota-tests

Proposed by Federico Gimenez
Status: Needs review
Proposed branch: lp://staging/~canonical-platform-qa/ubuntu-ota-tests/remove-si-autopkgtest-workarounds
Merge into: lp://staging/ubuntu-ota-tests
Diff against target: 489 lines (+13/-395)
5 files modified
README.rst (+0/-1)
adb-reboot-to-recovery (+0/-344)
ubuntu_ota_tests/command_line.py (+1/-26)
ubuntu_ota_tests/hooks.py (+5/-23)
ubuntu_ota_tests/upgrade.py (+7/-1)
To merge this branch: bzr merge lp://staging/~canonical-platform-qa/ubuntu-ota-tests/remove-si-autopkgtest-workarounds
Reviewer Review Type Date Requested Status
Vincent Ladeuil (community) Approve
Review via email: mp+260060@code.staging.launchpad.net

Commit message

Removed workarounds for si and autopkgtest

Description of the change

After the release of systemimage 3.0 we can remove the code that installed it from a ppa and the workaround for fixing the problem with the different locations used for reading and writting the si configuration.

With the addition of the /tmp/autopkgtest-reboot-prepare command in autopkgtest we don't need anymore the forked ssh adb script which added a reboot option, nor setting the 'recovery' marker to be used by this option. Now we can just save the status of the test with the new command and reboot to recovery from the test itself.

To post a comment you must log in.
Revision history for this message
Martin Pitt (pitti) wrote :

\o/ Thanks Frederico!

Revision history for this message
Vincent Ladeuil (vila) wrote :

Nice cleanup \o/

review: Approve

Unmerged revisions

18. By Federico Gimenez

Removed workarounds for si and autopkgtest

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: