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

+1 but with a couple of comments that are non blocking

Merged as we need to start and test a build with this change today

On Mon, Oct 15, 2018 at 08:35:50AM -0000, Philip Roche wrote:
> Diff comments:
>
> > === modified file 'templates/img-azure.tmpl'
> > --- templates/img-azure.tmpl 2018-10-11 19:20:20 +0000
> > +++ templates/img-azure.tmpl 2018-10-14 21:46:08 +0000
> > @@ -220,12 +216,10 @@
> > xenial) pkgs+=(linux-azure
> > unscd)
> > rpkgs+=(linux-image-virtual linux-image-generic linux-.*4.4.*);;
> > - artful) pkgs+=(linux-cloud-tools-virtual unscd);;
> > - bionic) pkgs+=(linux-azure)
> > + *) pkgs+=(linux-azure)
>
> +1 for now but this will fail when we try and build a DD image and linux-azure will most likely not be present yet.

IIRC, packages are copied over from cosmic during opening, so we should
have cosmic's linux-azure in dd when it opens.

> > # N.B. This rpkgs is different to xenial's because linux-azure and
> > - # linux-generic are at the same version for bionic's release
> > + # linux-generic are at the same version for newer releases
> > rpkgs+=(linux-image-virtual linux-.*-generic);;
>
> I have found that '^linux-.*' 'linux-base+' worked in my cosmic tests. That doesn't mean "linux-image-virtual linux-.*-generic" does n't work. I just haven't tested it.

I think I failed to mention that I did a test build and boot, so I think
we're fine:

$ dpkg -l | grep linux- | grep -v azure
ii linux-base 4.5ubuntu1 all Linux image base package
ii linux-cloud-tools-common 4.18.0-10.11 all Linux kernel version specific cloud tools for version 4.18.0
ii linux-tools-common 4.18.0-10.11 all Linux kernel version specific tools for version 4.18.0