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

Proposed by Dan Watkins on 2018-10-14
Status: Merged
Merged at revision: 812
Proposed branch: lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm-oddbloke
Merge into: lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm
Diff against target: 65 lines (+6/-12)
1 file modified
templates/img-azure.tmpl (+6/-12)
To merge this branch: bzr merge lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm-oddbloke
Reviewer Review Type Date Requested Status
Philip Roche 2018-10-14 Approve on 2018-10-15
Dimitri John Ledkov 2018-10-14 Approve on 2018-10-14
Review via email: mp+356688@code.launchpad.net
To post a comment you must log in.
Dimitri John Ledkov (xnox) :
review: Approve
Philip Roche (philroche) wrote :

+1 but with a couple of comments that are non blocking

review: Approve
Philip Roche (philroche) wrote :

Merged as we need to start and test a build with this change today

Dan Watkins (daniel-thewatkins) wrote :

On Mon, Oct 15, 2018 at 08:35:50AM -0000, Philip Roche wrote:
> Diff comments:
>
> > === modified file 'templates/img-azure.tmpl'
> > --- templates/img-azure.tmpl 2018-10-11 19:20:20 +0000
> > +++ templates/img-azure.tmpl 2018-10-14 21:46:08 +0000
> > @@ -220,12 +216,10 @@
> > xenial) pkgs+=(linux-azure
> > unscd)
> > rpkgs+=(linux-image-virtual linux-image-generic linux-.*4.4.*);;
> > - artful) pkgs+=(linux-cloud-tools-virtual unscd);;
> > - bionic) pkgs+=(linux-azure)
> > + *) pkgs+=(linux-azure)
>
> +1 for now but this will fail when we try and build a DD image and linux-azure will most likely not be present yet.

IIRC, packages are copied over from cosmic during opening, so we should
have cosmic's linux-azure in dd when it opens.

> > # N.B. This rpkgs is different to xenial's because linux-azure and
> > - # linux-generic are at the same version for bionic's release
> > + # linux-generic are at the same version for newer releases
> > rpkgs+=(linux-image-virtual linux-.*-generic);;
>
> I have found that '^linux-.*' 'linux-base+' worked in my cosmic tests. That doesn't mean "linux-image-virtual linux-.*-generic" does n't work. I just haven't tested it.

I think I failed to mention that I did a test build and boot, so I think
we're fine:

$ dpkg -l | grep linux- | grep -v azure
ii linux-base 4.5ubuntu1 all Linux image base package
ii linux-cloud-tools-common 4.18.0-10.11 all Linux kernel version specific cloud tools for version 4.18.0
ii linux-tools-common 4.18.0-10.11 all Linux kernel version specific tools for version 4.18.0

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'templates/img-azure.tmpl'
2--- templates/img-azure.tmpl 2018-10-11 19:20:20 +0000
3+++ templates/img-azure.tmpl 2018-10-14 21:46:08 +0000
4@@ -146,7 +146,7 @@
5 # dirmngr & gpg-agent hold on to files under ${mp}/dev
6 # We are not aware of a lp bug # for this for now
7 case $suite in
8- precise|trusty|xenial)
9+ trusty|xenial)
10 # These are not affected by the gpg run-away process issue
11 ;;
12 *)
13@@ -208,10 +208,6 @@
14 rpkgs=(grub-legacy-ec2)
15 # Install per-suite requirements
16 case "${suite}" in
17- precise) pkgs+=(linux-image-hwe-generic
18- linux-cloud-tools-generic-lts-trusty
19- hv-kvp-daemon-init
20- ntp);;
21 trusty) pkgs+=(linux-image-virtual-lts-xenial
22 linux-cloud-tools-virtual-lts-xenial
23 ntp
24@@ -220,12 +216,10 @@
25 xenial) pkgs+=(linux-azure
26 unscd)
27 rpkgs+=(linux-image-virtual linux-image-generic linux-.*4.4.*);;
28- artful) pkgs+=(linux-cloud-tools-virtual unscd);;
29- bionic) pkgs+=(linux-azure)
30+ *) pkgs+=(linux-azure)
31 # N.B. This rpkgs is different to xenial's because linux-azure and
32- # linux-generic are at the same version for bionic's release
33+ # linux-generic are at the same version for newer releases
34 rpkgs+=(linux-image-virtual linux-.*-generic);;
35- *) pkgs+=(linux-cloud-tools-virtual);;
36 esac
37
38 # Test enablement for -proposed
39@@ -268,7 +262,7 @@
40
41 # Configure unscd
42 case "${suite}" in
43- trusty|xenial|artful)
44+ trusty|xenial)
45 [ -e "${mp}/etc/nscd.conf" ] &&
46 xchroot sed -e "s|enable-cache.*hosts.*no|enable-cache\t\thosts\tyes|g" \
47 -e "s|positive-time-to-live.*hosts.*3600|positive-time-to-live\thosts\t60|g" \
48@@ -298,7 +292,7 @@
49 # Or, on yakkety and later, reinstall grub-pc which is no longer in the base
50 # image
51 case $suite in
52- precise|trusty|wily|xenial)
53+ trusty|xenial)
54 xchroot dpkg-reconfigure grub-pc
55 ;;
56 *)
57@@ -361,7 +355,7 @@
58 # This call sources functions from livecd-rootfs, so call it as late as
59 # possible to reduce potential for conflicts
60 case $suite in
61- precise|trusty|xenial|artful)
62+ trusty|xenial)
63 # We only have the livecd-rootfs support for model assertions in bionic
64 # (and later)
65 ;;

Subscribers

People subscribed via source and target branches

to all changes: