VMBuilder

Merge lp://staging/~adeuring/vmbuilder/jenkins_kvm-optionally-use-juju-test-packages into lp://staging/~ubuntu-on-ec2/vmbuilder/jenkins_kvm

jenkins_kvm-optionally-use-juju-test-packages
Merge into jenkins_kvm

Proposed by Abel Deuring on 2014-08-05

Status:	Merged
Merge reported by:	Abel Deuring
Merged at revision:	not available
Proposed branch:	lp://staging/~adeuring/vmbuilder/jenkins_kvm-optionally-use-juju-test-packages
Merge into:	lp://staging/~ubuntu-on-ec2/vmbuilder/jenkins_kvm
Diff against target:	172 lines (+60/-8) 5 files modified build-juju-local.sh (+16/-1) handle-xdeb.py (+15/-0) launch_kvm.sh (+9/-3) standalone.sh (+4/-2) templates/img-juju.tmpl (+16/-2)
To merge this branch:	bzr merge lp://staging/~adeuring/vmbuilder/jenkins_kvm-optionally-use-juju-test-packages
Related bugs:	Link a bug report

Reviewer	Date Requested	Status
Abel Deuring (community)		Needs Resubmitting on 2014-08-06
Ben Howard (community)	2014-08-05	Disapprove on 2014-08-05
Review via email: mp+229606@code.staging.launchpad.net

Description of the change

The Juju QA team wants to build and test Vagrant boxes with debian packages that are regularily built by the team's CI infrastructure.

This branch adds two new environment variables, JUJU_CORE_PKG and JUJU_LOCAL_PKG. If they are defined, launch_kvm.sh adds the package files specificied by the variables to the cloud-init data and img-juju.tmpl installs them.

Revision history for this message

Ben Howard (darkmuggle-deactivatedaccount) wrote on 2014-08-05:

I'm okay with changing launch_kvm, however, changes must be generic and not specific. launch_kvm is used to buid a variety of images.

review: Disapprove

lp://staging/~adeuring/vmbuilder/jenkins_kvm-optionally-use-juju-test-packages updated on 2014-08-06

455. By Abel Deuring on 2014-08-06: Pass optional could-init files to launch_kvm.sh and standalone.sh via command a line parameter; add these parameter in build-juju-local.sh when then env variables JUJU_CORE_PKG or JUJU_LOCAL_PKG are set.

Revision history for this message

Abel Deuring (adeuring) wrote on 2014-08-06:

> I'm okay with changing launch_kvm, however, changes must be generic and not
> specific. launch_kvm is used to buid a variety of images.

I've changed launch_kvm.sh and standalone.sh to accept accept another parameter, --cloud-init-file. The value(s) of this parameter is(are) passed to write-mime-multipart.

review: Needs Resubmitting

lp://staging/~adeuring/vmbuilder/jenkins_kvm-optionally-use-juju-test-packages updated on 2014-08-14