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

Proposed by Robert C Jennings on 2019-04-18
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 Approve on 2019-04-22
Cody Shepherd 2019-04-18 Approve on 2019-04-22
David Krauser 2019-04-18 Approve on 2019-04-19
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.
review: Approve
review: Approve
Francis Ginther (fginther) wrote :

Approve

review: Approve
lp:~rcj/vmbuilder/jenkins_kvm updated on 2019-04-23
823. By Robert C Jennings on 2019-04-23

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
1=== modified file 'jenkins/CloudImages_Update_Builder.sh'
2--- jenkins/CloudImages_Update_Builder.sh 2017-10-26 19:35:04 +0000
3+++ jenkins/CloudImages_Update_Builder.sh 2019-04-18 22:27:00 +0000
4@@ -29,7 +29,7 @@
5 ;;
6 *)
7 disk_orig="${SUITE}-server-cloudimg-${ARCH}.img"
8- builder_img=/srv/builder/images/artful-builder-latest.img
9+ builder_img=/srv/builder/images/bionic-builder-latest.img
10 ;;
11 esac
12
13
14=== modified file 'templates/img-update.tmpl'
15--- templates/img-update.tmpl 2018-10-13 20:02:22 +0000
16+++ templates/img-update.tmpl 2019-04-18 22:27:00 +0000
17@@ -229,15 +229,15 @@
18 ;;
19 esac
20 xchroot apt-add-repository -y multiverse
21-pkgs+=(qemu-user-static
22- qemu-user
23- ubuntu-snappy-cli
24+pkgs+=(ubuntu-snappy-cli
25 python-openstackclient
26 cloud-utils)
27 case "${suite}" in
28 trusty|xenial)
29- pkgs+=(ubuntu-core-security-utils)
30+ pkgs+=(ubuntu-core-security-utils qemu-user-static qemu-user)
31 ;;
32+ bionic|cosmic)
33+ pkgs+=(qemu-user-static qemu-user)
34 esac
35 # ubuntu-device-flash was dropped after zesty
36 case "${suite}" in

Subscribers

People subscribed via source and target branches