ubuntu-ota-tests

Merge lp://qastaging/~canonical-platform-qa/ubuntu-ota-tests/apply-dbus-upgrade into lp://qastaging/ubuntu-ota-tests

  1. apply-dbus-upgrade
  2. Merge into trunk
Proposed by Federico Gimenez
Status: Merged
Approved by: Brendan Donegan
Approved revision: 77
Merged at revision: 17
Proposed branch: lp://qastaging/~canonical-platform-qa/ubuntu-ota-tests/apply-dbus-upgrade
Merge into: lp://qastaging/ubuntu-ota-tests
Prerequisite: lp://qastaging/~canonical-platform-qa/ubuntu-ota-tests/dbus-upgrade
Diff against target: 150 lines (+47/-24)
6 files modified
README.rst (+1/-1)
adb-reboot-to-recovery (+8/-1)
debian/tests/control (+9/-4)
debian/tests/ota-dbus-upgrade (+0/-12)
ubuntu_ota_tests/command_line.py (+27/-2)
ubuntu_ota_tests/tests/test_basic_upgrade.py (+2/-4)
To merge this branch: bzr merge lp://qastaging/~canonical-platform-qa/ubuntu-ota-tests/apply-dbus-upgrade
Reviewer Review Type Date Requested Status
Brendan Donegan (community) Approve
PS Jenkins bot continuous-integration Approve
Christopher Lee (community) Approve
Barry Warsaw (community) Approve
Review via email: mp+254214@code.qastaging.launchpad.net

Commit message

Fix apply upgrade

Description of the change

After downloading the upgrade and rebooting into recovery the upgrade is not being applied

To post a comment you must log in.
Revision history for this message
Federico Gimenez (fgimenez) wrote :

Changing the command to execute the test to

$ adt-run -B --unbuilt-tree=. --setup-commands 'mount -o remount,rw /' --setup-commands 'apt-add-repository -y ppa:barry/systemimage' --setup-commands 'apt-get --no-list-cleanup update -o Dir::Etc::SourceList=/dev/null' --setup-commands 'apt-get install -y -q system-image-cli system-image-common system-image-dbus' --setup-commands 'if [ ! -d "/etc/system-image/config.d" ]; then mkdir -p /etc/system-image/config.d && cd /etc/system-image && ln -sf ../client.ini config.d/00_default.ini && ln -sf ../channel.ini config.d/01_channel.ini; fi' --setup-commands 'sync; sleep 2; mount -o remount,ro /' --output /tmp/ota --- ssh -s ./adb-reboot-to-recovery

fixes the issue and the upgrade is applied correctly. More info in the bug [1]

[1] https://bugs.launchpad.net/ubuntu-ota-tests/+bug/1436753

Revision history for this message
Barry Warsaw (barry) wrote :

LGTM. Just one comment.

review: Approve
lp://qastaging/~canonical-platform-qa/ubuntu-ota-tests/apply-dbus-upgrade updated
71. By Federico Gimenez

Merged trunk; integrated test execution with the run-ota-tests script

Revision history for this message
Federico Gimenez (fgimenez) wrote :

Ok, now it's integrated with the common runner and can be executed (with the rest of the tests) with something like:

$ ./run-ota-tests --wifi-ssid {wifi-ssid} --wifi-password {wifi-password} --ssh-overwrite-script ./adb-reboot-to-recovery --output_dir /tmp/ota_tests_results

Thanks!

lp://qastaging/~canonical-platform-qa/ubuntu-ota-tests/apply-dbus-upgrade updated
72. By Federico Gimenez

Prevent error for existing output dir

73. By Federico Gimenez

added python3-autopilot dependency to check-for-update test

74. By Federico Gimenez

Added changes to ensure adb on reboot

The changes come from
http://anonscm.debian.org/cgit/autopkgtest/autopkgtest.git/commit/?id=85a179dbad7c30924e451b6fe56eb7272d753e37

75. By Federico Gimenez

More changes from ssh-setup/adb

76. By Federico Gimenez

merged trunk

77. By Federico Gimenez

merged trunk

Revision history for this message
Christopher Lee (veebers) wrote :

LGTM.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)
Revision history for this message
Brendan Donegan (brendan-donegan) wrote :

Top-approving

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

to all changes: