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

[Dan Watkins]

[Dan Watkins (oddbloke)]

I've successfully built an image using this, and it booted fine.

[Francis Ginther (fginther)]

Approve

review: Approve

[Chris Glass (tribaal)]

review: Approve

[lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm-oddbloke]

797. By Dan Watkins on 2018-03-22

Install linux-azure in bionic Azure images [a=Odd_Bloke][r=fginther,tribaal]

MP: https://code.launchpad.net/~ubuntu-on-ec2/vmbuilder/jenkins_kvm-oddbloke/+merge/341846

=== modified file 'templates/img-azure.tmpl'
--- templates/img-azure.tmpl	2018-02-15 22:58:03 +0000
+++ templates/img-azure.tmpl	2018-03-21 18:44:45 +0000
@@ -209,6 +209,10 @@
                     unscd)
              rpkgs+=(linux-image-virtual linux-image-generic linux-.*4.4.*);;
     artful)  pkgs+=(linux-cloud-tools-virtual unscd);;
+    bionic)  pkgs+=(linux-azure)
+             # N.B. This rpkgs is different to xenial's because linux-azure and
+             # linux-generic are at the same version for bionic's release
+             rpkgs+=(linux-image-virtual linux-.*-generic);;
          *)  pkgs+=(linux-cloud-tools-virtual);;
 esac