Merge lp:~doanac/ubuntu-ci-services-itself/kernel-build into lp:ubuntu-ci-services-itself

[Andy Doan]

image-builder: add ability to install a kernel package

Get Paul's fix in for installing a kernel package.

[Francis Ginther (fginther)]

This are plars changes updated to the latest trunk. I've also been testing these changes on at least 3 non-kernel tickets today. All looks good.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:389
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/432/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/432/rebuild

review: Approve (continuous-integration)

=== modified file 'image-builder/imagebuilder/cloud_image.py'
--- image-builder/imagebuilder/cloud_image.py	2014-03-14 21:56:01 +0000
+++ image-builder/imagebuilder/cloud_image.py	2014-03-14 21:56:01 +0000
@@ -78,7 +78,9 @@
 
 def _chrooted(chroot, cmd):
     log.info('Running command in image: {0}'.format(cmd))
-    output = subprocess.check_output(['chroot', chroot] + cmd.split(" "))
+    if type(cmd) is not list:
+        cmd = cmd.split(' ')
+    output = subprocess.check_output(['chroot', chroot] + cmd)
     if output:
         log.info(output)
 
@@ -121,8 +123,12 @@
     '''Run commands in the chroot to do update the sources and add packages
     '''
     status_cb('Adding requested packages to the image...')
-    _chrooted(chroot, "/usr/bin/apt-get install -y {pkglist}".format(
-              pkglist=string.join(pkglist, " ")))
+    os.environ['DEBIAN_FRONTEND'] = 'noninteractive'
+    _chrooted(chroot,
+              ['/bin/bash', '-c',
+               ('/usr/bin/apt-get -o Dpkg::Options::=\"--force-confdef\" '
+                '-o Dpkg::Options::=\"--force-confold\" install -y '
+                '{pkglist}'.format(pkglist=string.join(pkglist, " ")))])
     _chrooted(chroot, "/usr/bin/apt-get clean")
 
     #create a big null data file and remove it to make it more compressable