Ubuntu CI Services

Merge lp://staging/~doanac/ubuntu-ci-services-itself/imgbuild-kernel-fixes into lp://staging/ubuntu-ci-services-itself

imgbuild-kernel-fixes
Merge into trunk

Proposed by Andy Doan on 2014-03-15

Status:	Merged
Approved by:	Andy Doan on 2014-03-17
Approved revision:	404
Merged at revision:	409
Proposed branch:	lp://staging/~doanac/ubuntu-ci-services-itself/imgbuild-kernel-fixes
Merge into:	lp://staging/ubuntu-ci-services-itself
Diff against target:	144 lines (+40/-13) 3 files modified image-builder/imagebuilder/cloud_image.py (+32/-11) image-builder/imagebuilder/tests/test_modify_cloud_image.py (+5/-2) juju-deployer/configs/unit_config.yaml.tmpl (+3/-0)
To merge this branch:	bzr merge lp://staging/~doanac/ubuntu-ci-services-itself/imgbuild-kernel-fixes
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Paul Larson			Approve on 2014-03-17
PS Jenkins bot (community)	continuous-integration		Approve on 2014-03-15
Evan (community)		2014-03-15	Approve on 2014-03-15
Review via email: mp+211178@code.staging.launchpad.net

Commit message

image-builder: fixes required to get kernel testing working

Description of the change

This fixes the issues I've discovered in the image-builder. The whole diff is small, but it might make more sense to read each commit on its own to see *why* I made these chages.

Revision history for this message

Evan (ev) wrote on 2014-03-15:

57 + _chrooted(chroot, 'apt-get install -y {}'.format(' '.join(pkglist)))

We have all the apt keys imported and the cache updated, yes? I'm typing this from my iPad, otherwise I'd check myself.

139 +image_size: 4G

Can we have a comment documenting what this does and why it's set to 4G?

Otherwise +1. Good stuff.

Have you checked with Paul on why we had those dpkg's options set in the first place?

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-15:

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

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

review: Approve (continuous-integration)

Revision history for this message

Paul Larson (pwlars) wrote on 2014-03-15:

> Have you checked with Paul on why we had those dpkg's options set in the first
> place?
Yes, those were set to get around grub wanting to give an interactive prompt to decide what to do about the config file. From what Andy and I discussed earlier on IRC, it should be ok to remove them since he has 'etc/default/grub.d/99-ci-eng.cfg' getting created and used, but I'm working on testing it now using this branch.

lp://staging/~doanac/ubuntu-ci-services-itself/imgbuild-kernel-fixes updated on 2014-03-15