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

[Francis Ginther]

Add an artful version of the Azure suite specific template files,
img-azure-17.10-addin.tmpl. Also touch up the other suite specific template
files still in use to properly indicate the suite name. Also extends the
life of `ubuntu-adj2version` for a few more releases up to `cc`.

Add an artful version of the Azure suite specific template files,
img-azure-17.10-addin.tmpl. Also touch up the other suite specific template
files still in use to properly indicate the suite name. Also extends the
life of `ubuntu-adj2version` for a few more releases up to `cc`.

ubuntu-adj2version examples:

$ ./ubuntu-adj2version trusty
14.04
$ ./ubuntu-adj2version xenial
16.04
$ ./ubuntu-adj2version zesty
17.04
$ ./ubuntu-adj2version artful
17.10
$ ./ubuntu-adj2version breazy
18.04
$ ./ubuntu-adj2version crafty
18.10
$ ./ubuntu-adj2version dreamy
6.04

A test image was built and tests are running here: https://cloud-images-jenkins.canonical.com/view/Azure/job/Azure-Tests/1531/

The BasicAzureTests.test_archive issue has been resolved in the tests that have completed so far. I also manually verified the contents of source.list on an image which now shows "http://azure.archive.ubuntu.com/ubuntu/" and has the correct setting for `ClientAliveInterval` in `/etc/ssh/sshd_config`.

[Robert C Jennings (rcj)]

+1. Bonus points for a 18.04 template too. (hint)

review: Approve

[Dan Watkins (oddbloke)]

review: Approve

[Dimitri John Ledkov (xnox)]

Hm, can this be made 'p' and up? the only lingering things around the block is precise, and the rest has now looped.

review: Abstain

=== modified file 'templates/img-azure-16.04-addin.tmpl'
--- templates/img-azure-16.04-addin.tmpl	2016-05-10 20:55:19 +0000
+++ templates/img-azure-16.04-addin.tmpl	2017-10-17 13:10:28 +0000
@@ -1,5 +1,5 @@
 # vi: ts=4 noexpandtab syntax=sh
-# Insert the Trusty Config
+# Insert the Xenial 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

=== modified file 'templates/img-azure-17.04-addin.tmpl'
--- templates/img-azure-17.04-addin.tmpl	2017-02-09 16:15:43 +0000
+++ templates/img-azure-17.04-addin.tmpl	2017-10-17 13:10:28 +0000
@@ -1,5 +1,5 @@
 # vi: ts=4 noexpandtab syntax=sh
-# Insert the Trusty Config
+# Insert the Zesty 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-17.10-addin.tmpl'
--- templates/img-azure-17.10-addin.tmpl	1970-01-01 00:00:00 +0000
+++ templates/img-azure-17.10-addin.tmpl	2017-10-17 13:10:28 +0000
@@ -0,0 +1,58 @@
+# vi: ts=4 noexpandtab syntax=sh
+# Insert the Artful 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

=== modified file 'ubuntu-adj2version'
--- ubuntu-adj2version	2012-09-06 23:26:58 +0000
+++ ubuntu-adj2version	2017-10-17 13:10:28 +0000
@@ -23,7 +23,7 @@
 ubuntu_adj2ver() {
 	# over engineered function, convert ubuntu adjective to version
 	# based on its first letter.
-	local letter1="" list=defghijklmnopqrstuvwxyz
+	local letter1="" list=defghijklmnopqrstuvwxyzabc
 	local baseyear=6 year="" month="04" tmp="" relnum=""
 
 	[ "$1" = "warty" -o "$1" = "Warty" -o "$1" = "WARTY" ] &&