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

Proposed by Robert C Jennings
Status: Merged
Merged at revision: 823
Proposed branch: lp:~rcj/vmbuilder/jenkins_kvm
Merge into: lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm
Diff against target: 36 lines (+5/-5)
2 files modified
jenkins/CloudImages_Update_Builder.sh (+1/-1)
templates/img-update.tmpl (+4/-4)
To merge this branch: bzr merge lp:~rcj/vmbuilder/jenkins_kvm
Reviewer Review Type Date Requested Status
Francis Ginther (community) Approve
Cody Shepherd (community) Approve
David Krauser (community) Approve
Review via email: mp+366297@code.launchpad.net

Commit message

builder: Fixes to build disco images

Installation of qemu-user[-static] for disco image gets the chroot in
a state where the root filesystem can not be unmounted. This relates
to the binfmt-support package which is installed in the chroot as a
dependency of qemu-user. The simplest solution is to remove those
packages as the build system no longer requires them. This patch
retains the package installation in the prior supported releases.

To post a comment you must log in.
Revision history for this message
David Krauser (davidkrauser) :
review: Approve
Revision history for this message
Cody Shepherd (codyshepherd) :
review: Approve
Revision history for this message
Francis Ginther (fginther) wrote :

Approve

review: Approve
lp:~rcj/vmbuilder/jenkins_kvm updated
823. By Robert C Jennings

Merge lp:~rcj/vmbuilder/jenkins_kvm into lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm [a=rcj] [r=codyshepherd,davidkrauser,fginther]

builder: Fixes to build disco images

Installation of qemu-user[-static] for disco image gets the chroot in
a state where the root filesystem can not be unmounted. This relates
to the binfmt-support package which is installed in the chroot as a
dependency of qemu-user. The simplest solution is to remove those
packages as the build system no longer requires them. This patch
retains the package installation in the prior supported releases.

MP: https://code.launchpad.net/~rcj/vmbuilder/jenkins_kvm/+merge/366297

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'jenkins/CloudImages_Update_Builder.sh'
--- jenkins/CloudImages_Update_Builder.sh 2017-10-26 19:35:04 +0000
+++ jenkins/CloudImages_Update_Builder.sh 2019-04-18 22:27:00 +0000
@@ -29,7 +29,7 @@
29 ;;29 ;;
30 *)30 *)
31 disk_orig="${SUITE}-server-cloudimg-${ARCH}.img"31 disk_orig="${SUITE}-server-cloudimg-${ARCH}.img"
32 builder_img=/srv/builder/images/artful-builder-latest.img32 builder_img=/srv/builder/images/bionic-builder-latest.img
33 ;;33 ;;
34esac34esac
3535
3636
=== modified file 'templates/img-update.tmpl'
--- templates/img-update.tmpl 2018-10-13 20:02:22 +0000
+++ templates/img-update.tmpl 2019-04-18 22:27:00 +0000
@@ -229,15 +229,15 @@
229 ;;229 ;;
230esac230esac
231xchroot apt-add-repository -y multiverse231xchroot apt-add-repository -y multiverse
232pkgs+=(qemu-user-static232pkgs+=(ubuntu-snappy-cli
233 qemu-user
234 ubuntu-snappy-cli
235 python-openstackclient233 python-openstackclient
236 cloud-utils)234 cloud-utils)
237case "${suite}" in235case "${suite}" in
238 trusty|xenial)236 trusty|xenial)
239 pkgs+=(ubuntu-core-security-utils)237 pkgs+=(ubuntu-core-security-utils qemu-user-static qemu-user)
240 ;;238 ;;
239 bionic|cosmic)
240 pkgs+=(qemu-user-static qemu-user)
241esac241esac
242# ubuntu-device-flash was dropped after zesty242# ubuntu-device-flash was dropped after zesty
243case "${suite}" in243case "${suite}" in

Subscribers

People subscribed via source and target branches