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

[Robert C Jennings]

builder image: support cosmic builds

* remove binfmt-misc module on host to avoid chroot teardown issue
* python-vm-builder not present in cosmic
* Kill dirmngr/gpg-agent before chroot teardown

[Dan Watkins (oddbloke)]

review: Approve

[Francis Ginther (fginther)]

Approve

review: Approve

[lp:~rcj/vmbuilder/jenkins_kvm]

813. By Francis Ginther on 2018-10-26

Add 'git' to the build environment for maas images [a=fginther] [r=rcj,philroche]

The maas branches have moved from bzr to git and we therefore need
git to be available. This also configures an http.proxy when cloning.
The proxy is only needed for the ppc64el jobs, but has to also work
without the proxy when building the other architectures.

814. By Robert C Jennings on 2018-10-27

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

builder image: support cosmic builds

* remove binfmt-misc module on host to avoid chroot teardown issue
* python-vm-builder not present in cosmic
* Kill dirmngr/gpg-agent before chroot teardown

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

=== modified file 'templates/img-update.tmpl'
--- templates/img-update.tmpl	2017-10-26 19:35:04 +0000
+++ templates/img-update.tmpl	2018-10-15 15:40:16 +0000
@@ -59,9 +59,11 @@
 		}
 	done
 
-	cp /etc/mtab "${mp}/etc/mtab" &&
-		debug "Copied fake mtab over" ||
-		fail  "Unable to copy mtab in place"
+	if [ ! -e "${mp}/etc/mtab" ]; then
+		cp /etc/mtab "${mp}/etc/mtab" &&
+			debug "Copied fake mtab over" ||
+			fail  "Unable to copy mtab in place"
+	fi
 
 	cat > "${mp}/usr/sbin/policy-rc.d" << EOF
 #!/bin/sh
@@ -148,6 +150,20 @@
 	sync
 	sleep 5
 
+    # From yakkety we have detected errors when trying to unmount /dev
+    # Seems this is caused by run-away GPG processes after using a PPA,
+    # dirmngr & gpg-agent hold on to files under ${mp}/dev
+    # We are not aware of a lp bug # for this for now
+    case $suite in
+        precise|trusty|xenial)
+            # These are not affected by the gpg run-away process issue
+            ;;
+        *)
+            killall --verbose --wait dirmngr || true
+            killall --verbose --wait gpg-agent ||true
+        ;;
+    esac
+
 	umount -f "${mp}/dev/pts" &&
 		debug "Unmounted /dev/pts in chroot" ||
 		fail "Unable to dismount /dev/pts in chroot"
@@ -179,6 +195,11 @@
 		{ debug "   Command FAILED!"; sleep 60; fail "chrooted-command failed!"; }
 }
 
+# Installation of qemu-user-static in a cosmic chroot results in a root fs
+# that can not be unmounted if the host binfmt_misc module is loaded on the host
+apt-get purge -qqy binfmt-support
+modprobe -r binfmt_misc
+
 # Setup the environment
 build_chroot
 
@@ -189,7 +210,6 @@
 # Installation of base packages
 kheaders=$(xchroot dpkg-query -W | awk '/linux-image-3.*virtual/{print$1}' | sed "s|image|headers|g")
 pkgs=(bzr debootstrap
-      python-vm-builder
       kpartx
 	  qemu-kvm
 	  debhelper
@@ -226,6 +246,13 @@
 		;;
 esac
 
+# python-vm-builder was dropped in cosmic
+case "${suite}" in
+	trusty|xenial|bionic)
+		pkgs+=(python-vm-builder)
+		;;
+esac
+
 # Installation of packages
 debug "Performing package operations"
 xchroot apt-get -y update