Merge lp:~paride/auto-upgrade-testing/ramsettings into lp:auto-upgrade-testing
Status: | Merged |
---|---|
Merged at revision: | 94 |
Proposed branch: | lp:~paride/auto-upgrade-testing/ramsettings |
Merge into: | lp:auto-upgrade-testing |
Diff against target: |
22 lines (+3/-2) 1 file modified
upgrade_testing/provisioning/backends/_qemu.py (+3/-2) |
To merge this branch: | bzr merge lp:~paride/auto-upgrade-testing/ramsettings |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
platform-qa-bot | continuous-integration | Approve | |
Brian Murray | Approve | ||
Review via email: mp+374097@code.launchpad.net |
Commit message
qemu backend: honor DEFAULT_CPU and DEFAULT_RAM
When using qemu the upgrade test can work in two modes: by calling
adt-run (autopkgtest) with the qemu backend, or in "keep-overlay"
mode, where a qemu VM is started by the test harness and adt-run
is made use it via its SSH backend. The DEFAULT_CPU and DEFAULT_RAM settings were used only in keep-overlay mode, and ignored when using
the qemu backend directly.
This commit passes DEFAULT_CPU and DEFAULT_RAM to the qemu backend, using the flags specified in autopkgtest-
This issue has been discovered as the Ubuntu Deskop upgrade from Disco to Eoan takes more than 1GB of ram (qemu's default).
FAILED: Continuous integration, rev:94 /platform- qa-jenkins. ubuntu. com/job/ auto-upgrade- testing- ci/51/ /platform- qa-jenkins. ubuntu. com/job/ build-disco- amd64-package/ 9/console /platform- qa-jenkins. ubuntu. com/job/ build-disco- i386-package/ 8/console /platform- qa-jenkins. ubuntu. com/job/ generic- update- mp/2501/ console
https:/
Executed test runs:
FAILURE: https:/
FAILURE: https:/
None: https:/
Click here to trigger a rebuild: /platform- qa-jenkins. ubuntu. com/job/ auto-upgrade- testing- ci/51/rebuild
https:/