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

Proposed by Francis Ginther on 2017-10-17
Status: Merged
Merged at revision: 791
Proposed branch: lp:~fginther/vmbuilder/jenkins_kvm-add-azure-17.10
Merge into: lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm
Diff against target: 97 lines (+61/-3)
4 files modified
templates/img-azure-16.04-addin.tmpl (+1/-1)
templates/img-azure-17.04-addin.tmpl (+1/-1)
templates/img-azure-17.10-addin.tmpl (+58/-0)
ubuntu-adj2version (+1/-1)
To merge this branch: bzr merge lp:~fginther/vmbuilder/jenkins_kvm-add-azure-17.10
Reviewer Review Type Date Requested Status
Dimitri John Ledkov Abstain on 2017-10-17
Dan Watkins 2017-10-17 Approve on 2017-10-17
Robert C Jennings 2017-10-17 Approve on 2017-10-17
Review via email: mp+332347@code.launchpad.net

Commit message

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`.

Description of the change

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`.

To post a comment you must log in.
Robert C Jennings (rcj) wrote :

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

review: Approve
review: Approve
Dimitri John Ledkov (xnox) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'templates/img-azure-16.04-addin.tmpl'
2--- templates/img-azure-16.04-addin.tmpl 2016-05-10 20:55:19 +0000
3+++ templates/img-azure-16.04-addin.tmpl 2017-10-17 13:10:28 +0000
4@@ -1,5 +1,5 @@
5 # vi: ts=4 noexpandtab syntax=sh
6-# Insert the Trusty Config
7+# Insert the Xenial Config
8 CLOUD_IMG_STR="# CLOUD_IMG: This file was created/modified by the Cloud Image build process"
9 cat << EOF > ${mp}/etc/default/grub.d/50-cloudimg-settings.cfg
10 # Windows Azure specific grub settings
11
12=== modified file 'templates/img-azure-17.04-addin.tmpl'
13--- templates/img-azure-17.04-addin.tmpl 2017-02-09 16:15:43 +0000
14+++ templates/img-azure-17.04-addin.tmpl 2017-10-17 13:10:28 +0000
15@@ -1,5 +1,5 @@
16 # vi: ts=4 noexpandtab syntax=sh
17-# Insert the Trusty Config
18+# Insert the Zesty Config
19 CLOUD_IMG_STR="# CLOUD_IMG: This file was created/modified by the Cloud Image build process"
20 cat << EOF > ${mp}/etc/default/grub.d/50-cloudimg-settings.cfg
21 # Windows Azure specific grub settings
22
23=== added file 'templates/img-azure-17.10-addin.tmpl'
24--- templates/img-azure-17.10-addin.tmpl 1970-01-01 00:00:00 +0000
25+++ templates/img-azure-17.10-addin.tmpl 2017-10-17 13:10:28 +0000
26@@ -0,0 +1,58 @@
27+# vi: ts=4 noexpandtab syntax=sh
28+# Insert the Artful Config
29+CLOUD_IMG_STR="# CLOUD_IMG: This file was created/modified by the Cloud Image build process"
30+cat << EOF > ${mp}/etc/default/grub.d/50-cloudimg-settings.cfg
31+# Windows Azure specific grub settings
32+${CLOUD_IMG_STR}
33+
34+# Set the default commandline
35+GRUB_CMDLINE_LINUX_DEFAULT="console=tty1 console=ttyS0 earlyprintk=ttyS0 rootdelay=300"
36+
37+# Set the grub console type
38+GRUB_TERMINAL=serial
39+
40+# Set the serial command
41+GRUB_SERIAL_COMMAND="serial --speed=9600 --unit=0 --word=8 --parity=no --stop=1"
42+
43+# Set the recordfail timeout
44+GRUB_RECORDFAIL_TIMEOUT=0
45+
46+# Do not wait on grub prompt
47+GRUB_TIMEOUT=0
48+EOF
49+
50+# Add in the client keep alive
51+cat << EOF >> "${mp}/etc/ssh/sshd_config"
52+
53+${CLOUD_IMG_STR}
54+ClientAliveInterval 120
55+EOF
56+
57+# Add the configuration for Cloud-init
58+cat << EOF > "${mp}/etc/cloud/cloud.cfg.d/90-azure.cfg"
59+${CLOUD_IMG_STR}
60+system_info:
61+ package_mirrors:
62+ - arches: [i386, amd64]
63+ failsafe:
64+ primary: http://archive.ubuntu.com/ubuntu
65+ security: http://security.ubuntu.com/ubuntu
66+ search:
67+ primary:
68+ - http://azure.archive.ubuntu.com/ubuntu/
69+ security: []
70+ - arches: [armhf, armel, default]
71+ failsafe:
72+ primary: http://ports.ubuntu.com/ubuntu-ports
73+ security: http://ports.ubuntu.com/ubuntu-ports
74+
75+EOF
76+
77+# Frame buffer fix
78+cat << EOF >> "${mp}/etc/initramfs-tools/modules"
79+
80+# Need for slow boot times due to framebuffer
81+hyperv_fb
82+EOF
83+
84+xchroot update-initramfs -u -k all
85
86=== modified file 'ubuntu-adj2version'
87--- ubuntu-adj2version 2012-09-06 23:26:58 +0000
88+++ ubuntu-adj2version 2017-10-17 13:10:28 +0000
89@@ -23,7 +23,7 @@
90 ubuntu_adj2ver() {
91 # over engineered function, convert ubuntu adjective to version
92 # based on its first letter.
93- local letter1="" list=defghijklmnopqrstuvwxyz
94+ local letter1="" list=defghijklmnopqrstuvwxyzabc
95 local baseyear=6 year="" month="04" tmp="" relnum=""
96
97 [ "$1" = "warty" -o "$1" = "Warty" -o "$1" = "WARTY" ] &&

Subscribers

People subscribed via source and target branches