Merge lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm-stilson into lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm

Proposed by Francis Ginther
Status: Merged
Merged at revision: 799
Proposed branch: lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm-stilson
Merge into: lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm
Diff against target: 12 lines (+1/-1)
1 file modified
launch_kvm.sh (+1/-1)
To merge this branch: bzr merge lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm-stilson
Reviewer Review Type Date Requested Status
Dan Watkins (community) Approve
Robert C Jennings (community) Approve
Review via email: mp+348351@code.launchpad.net

Commit message

Use root="/dev/vdc" to match the disk device names applied by kvm on stilson.

Description of the change

This does result in a successful build: https://cloud-images-jenkins.canonical.com/job/TEMP-CloudImages_Base_14.04-LTS-ppc64el/7/

I did not investigate why the device names changed and don't plan to spend any further time on it as this only impacts trusty ppc64el builds. Stilson is running xenial, while snyder was running something much older (and rpm based).

To post a comment you must log in.
Revision history for this message
Robert C Jennings (rcj) wrote :

+1

review: Approve
Revision history for this message
Dan Watkins (oddbloke) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'launch_kvm.sh'
2--- launch_kvm.sh 2015-03-12 09:33:11 +0000
3+++ launch_kvm.sh 2018-06-21 18:11:02 +0000
4@@ -157,7 +157,7 @@
5 if [ -n "${QEMU_KERNEL}" ]; then
6 root="/dev/vda1"
7 if [[ "$(uname -p)" =~ "ppc64" ]]; then
8- root="/dev/vda"
9+ root="/dev/vdc"
10 fi
11 kvm_cmd+=(-kernel ${QEMU_KERNEL}
12 -append "earlyprintk root=${root} console=hvc0"

Subscribers

People subscribed via source and target branches

to all changes: