Merge lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm-add-azure-cc into lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm

[Francis Ginther]

Add a cosmic version of the Azure suite specific template files, img-azure-18.10-addin.tmpl.

Cosmic is missing the azure addin template which defines the package archive URL and should resolve these test failures:

https://cloud-images-jenkins.canonical.com/job/Azure-Tests/1875/TEST=azure-general,VMSIZE=A8,WITH_PASSWORD=yes,label=EC2-Tester/testReport/junit/(root)/BasicAzureTests/test_archive/

[Robert C Jennings (rcj)]

diff to last release to see changes from bionic

[Robert C Jennings (rcj)]

+1

review: Approve

[Philip Roche (philroche)]

review: Approve

=== added file 'templates/img-azure-18.10-addin.tmpl'
--- templates/img-azure-18.10-addin.tmpl	1970-01-01 00:00:00 +0000
+++ templates/img-azure-18.10-addin.tmpl	2018-07-02 12:55:11 +0000
@@ -0,0 +1,58 @@
+# vi: ts=4 noexpandtab syntax=sh
+# Insert the Cosmic (18.10) Config
+CLOUD_IMG_STR="# CLOUD_IMG: This file was created/modified by the Cloud Image build process"
+cat << EOF > ${mp}/etc/default/grub.d/50-cloudimg-settings.cfg
+# Windows Azure specific grub settings
+${CLOUD_IMG_STR}
+
+# Set the default commandline
+GRUB_CMDLINE_LINUX_DEFAULT="console=tty1 console=ttyS0 earlyprintk=ttyS0 rootdelay=300"
+
+# Set the grub console type
+GRUB_TERMINAL=serial
+
+# Set the serial command
+GRUB_SERIAL_COMMAND="serial --speed=9600 --unit=0 --word=8 --parity=no --stop=1"
+
+# Set the recordfail timeout
+GRUB_RECORDFAIL_TIMEOUT=0
+
+# Do not wait on grub prompt
+GRUB_TIMEOUT=0
+EOF
+
+# Add in the client keep alive
+cat << EOF >> "${mp}/etc/ssh/sshd_config"
+
+${CLOUD_IMG_STR}
+ClientAliveInterval 120
+EOF
+
+# Add the configuration for Cloud-init
+cat << EOF > "${mp}/etc/cloud/cloud.cfg.d/90-azure.cfg"
+${CLOUD_IMG_STR}
+system_info:
+   package_mirrors:
+     - arches: [i386, amd64]
+       failsafe:
+         primary: http://archive.ubuntu.com/ubuntu
+         security: http://security.ubuntu.com/ubuntu
+       search:
+         primary:
+           - http://azure.archive.ubuntu.com/ubuntu/
+         security: []
+     - arches: [armhf, armel, default]
+       failsafe:
+         primary: http://ports.ubuntu.com/ubuntu-ports
+         security: http://ports.ubuntu.com/ubuntu-ports
+
+EOF
+
+# Frame buffer fix
+cat << EOF >> "${mp}/etc/initramfs-tools/modules"
+
+# Need for slow boot times due to framebuffer
+hyperv_fb
+EOF
+
+xchroot update-initramfs -u -k all