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

[Cody Shepherd]

Add azure template for Eoan.

Add azure template for Eoan. This should fix failing archive tests.

[lp:~codyshepherd/vmbuilder/jenkins_kvm]

831. By Cody Shepherd on 2019-06-04

Really adding the template this time.

[lp:~codyshepherd/vmbuilder/jenkins_kvm]

832. By Cody Shepherd on 2019-06-04

Fixing suite labeling in comments

[David Krauser (davidkrauser)]

review: Needs Information

[lp:~codyshepherd/vmbuilder/jenkins_kvm]

833. By Cody Shepherd on 2019-06-04

Adding CLOUD_IMG_STR to mirror Alan hook

[David Krauser (davidkrauser)]

review: Approve

[Tobias Koch (tobijk)]

Thanks a lot for figuring this out!

review: Approve

[Steve Langasek (vorlon)]

comment inline

[Steve Langasek (vorlon)]

(Or maybe not comment inline, what the hell, lp? Here's the comment.)

=== modified file 'templates/img-azure-19.04-addin.tmpl'
--- templates/img-azure-19.04-addin.tmpl	2019-04-24 13:12:06 +0000
+++ templates/img-azure-19.04-addin.tmpl	2019-06-04 19:50:51 +0000
@@ -1,5 +1,5 @@
 # vi: ts=4 noexpandtab syntax=sh
-# Insert the Cosmic (18.10) Config
+# Insert the Disco (19.04) 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

=== added file 'templates/img-azure-19.10-addin.tmpl'
--- templates/img-azure-19.10-addin.tmpl	1970-01-01 00:00:00 +0000
+++ templates/img-azure-19.10-addin.tmpl	2019-06-04 19:50:51 +0000
@@ -0,0 +1,68 @@
+# vi: ts=4 noexpandtab syntax=sh
+# Insert the Eoan (19.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"
+
+# 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
+
+# Apply a workaround for adding multiple NICs (SF Case #222480)
+# This clears cloud-init's persistent network object, forcing network
+# rediscovery on each boot (which correctly finds NICs added after VM creation)
+mkdir -p "${mp}/lib/systemd/system/cloud-init-local.service.d"
+cat << EOF > "${mp}/lib/systemd/system/cloud-init-local.service.d/50-azure-clear-persistent-obj-pkl.conf"
+[Service]                                                               
+ExecStartPre=-/bin/sh -xc 'if [ -e /var/lib/cloud/instance/obj.pkl ]; then echo "cleaning persistent cloud-init object"; rm /var/lib/cloud/instance/obj.pkl; fi; exit 0'
+EOF
+
+# Frame buffer fix
+cat << EOF >> "${mp}/etc/initramfs-tools/modules"
+
+${CLOUD_IMG_STR}
+# Need for slow boot times due to framebuffer
+hyperv_fb
+EOF
+
+xchroot update-initramfs -u -k all