Merge lp:~canonical-platform-qa/utah/remove-append into lp:utah

Proposed by Max Brustkern
Status: Merged
Merged at revision: 1077
Proposed branch: lp:~canonical-platform-qa/utah/remove-append
Merge into: lp:utah
Diff against target: 21 lines (+2/-2)
1 file modified
utah/provisioning/vm.py (+2/-2)
To merge this branch: bzr merge lp:~canonical-platform-qa/utah/remove-append
Reviewer Review Type Date Requested Status
Christopher Lee (community) Approve
Canonical CI Engineering Pending
Review via email: mp+286834@code.launchpad.net

Description of the change

This branch comments out setting the serial port to append. In the current xenial version of qemu, this capability is defined but not supported. The directive is silently ignored on versions predating its introduction, as far as I can tell. I'd like to reintegrate it once we figure out how, but I think this is safer for now, since it will allow us to continue testing changes on xenial and trusty.

To post a comment you must log in.
Revision history for this message
Christopher Lee (veebers) wrote :

Can we file a bug that we can track somehow so we know when we can reintegrate it once it's fixed?

review: Needs Information
1077. By Max Brustkern

Filed bug

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

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'utah/provisioning/vm.py'
2--- utah/provisioning/vm.py 2016-02-10 22:40:15 +0000
3+++ utah/provisioning/vm.py 2016-02-22 20:43:59 +0000
4@@ -14,7 +14,6 @@
5 # with this program. If not, see <http://www.gnu.org/licenses/>.
6
7 """Provide functions for virtual machine provisioning."""
8-# TODO: Maybe combine the VM stuff into one file?
9
10
11 import apt
12@@ -386,7 +385,8 @@
13 serial.set('type', 'file')
14 source = ElementTree.Element('source')
15 source.set('path', self.syslog)
16- source.set('append', 'on')
17+ #TODO: reintegrate this when the required qemu version lands
18+# source.set('append', 'on') # lp#1548499
19 serial.append(source)
20 target = ElementTree.Element('target')
21 target.set('port', '0')

Subscribers

People subscribed via source and target branches