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

[Robert C Jennings]

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.

[David Krauser (davidkrauser)]

review: Approve

[Cody Shepherd (codyshepherd)]

review: Approve

[Francis Ginther (fginther)]

Approve

review: Approve

[lp:~rcj/vmbuilder/jenkins_kvm]

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

=== 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 @@
         ;;
     *)
         disk_orig="${SUITE}-server-cloudimg-${ARCH}.img"
-        builder_img=/srv/builder/images/artful-builder-latest.img
+        builder_img=/srv/builder/images/bionic-builder-latest.img
         ;;
 esac
 

=== 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 @@
 		;;
 esac
 xchroot apt-add-repository -y multiverse
-pkgs+=(qemu-user-static
-	qemu-user
-	ubuntu-snappy-cli
+pkgs+=(ubuntu-snappy-cli
 	python-openstackclient
 	cloud-utils)
 case "${suite}" in
 	trusty|xenial)
-		pkgs+=(ubuntu-core-security-utils)
+		pkgs+=(ubuntu-core-security-utils qemu-user-static qemu-user)
 		;;
+    bionic|cosmic)
+        pkgs+=(qemu-user-static qemu-user)
 esac
 # ubuntu-device-flash was dropped after zesty
 case "${suite}" in