Merge ~hyask/autopkgtest-cloud:skia/lxd_remotes_kernel into autopkgtest-cloud:master

Proposed by Skia
Status: Merged
Merged at revision: 5ff3f55ee4231bc890fd4d31c96cf9010e002f62
Proposed branch: ~hyask/autopkgtest-cloud:skia/lxd_remotes_kernel
Merge into: autopkgtest-cloud:master
Diff against target: 28 lines (+4/-2)
2 files modified
charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/armhf-lxd.userdata (+3/-1)
mojo/service-bundle (+1/-1)
Reviewer Review Type Date Requested Status
Tim Andersson Approve
Review via email: mp+468338@code.launchpad.net

Description of the change

See bug #2067633 for a description of the issue we faced. This works around the problem for all future LXD remotes.

To post a comment you must log in.
Revision history for this message
Tim Andersson (andersson123) wrote :

LGTM

review: Approve
Revision history for this message
Brian Murray (brian-murray) wrote :

Won't this need updating when we upgrade the hosts from Focal? How will we remember to do that if I'm correct?

Revision history for this message
Skia (hyask) wrote :

The host have already been upgraded from Focal with the move to bos03, and are running Jammy.
The question remains still, what will happen when we upgrade to Noble?

I see multiple aspects there:
- First, this won't happen magically, so someone will be watching anyway.
- The package probably won't be found, so the cloud-init will fail with an obvious `apt` error.
- If by some magic it does exists, then it maybe won't even be a problem in itself, because it's "just a kernel", and if the machine boots and works, there might be no point worrying?
- Even if it installs **and** brings issues, again, a dev will be watching, and both the `git log` and comment will point to the LP bug to have the context.
- Last time, when I did the upgrade from Focal to Jammy, a lot of other stuff broke anyway, so I guess a bit of time will need to be spent on this anyway when going from Jammy to Noble.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/armhf-lxd.userdata b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/armhf-lxd.userdata
2index 9141db5..471684a 100644
3--- a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/armhf-lxd.userdata
4+++ b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/armhf-lxd.userdata
5@@ -158,7 +158,9 @@ runcmd:
6 - sed -i '/GRUB_CMDLINE_LINUX=/ { s/quiet splash//; s/"$/ compat_uts_machine=armv7l systemd.unified_cgroup_hierarchy=false "/ }' /etc/default/grub
7 - update-grub
8
9- - apt-get install -y linux-image-generic
10+ # --install-suggests brings us linux-modules-extra, required for some netplan tests
11+ # linux-virtual-hwe-22.04 works around LP#2067633
12+ - apt-get install -y --install-suggests linux-virtual-hwe-22.04
13 - apt-get purge --auto-remove -y linux-headers-generic rsyslog mlocate
14 - dpkg -P `dpkg -l linux-headers* | grep ^ii | awk '{print $2}'`
15 - adduser ubuntu lxd
16diff --git a/mojo/service-bundle b/mojo/service-bundle
17index ae507f8..7628c14 100644
18--- a/mojo/service-bundle
19+++ b/mojo/service-bundle
20@@ -165,7 +165,7 @@ applications:
21 10.145.243.202: 3 # lxd-armhf-bos03-03 @ ps6-rb1-arm64-n1
22 10.145.243.27: 3 # lxd-armhf-bos03-04 @ ps6-ra2-arm64-n1
23 10.145.243.234: 3 # lxd-armhf-bos03-05 @ ps6-rb1-arm64-n1
24- 10.145.243.233: 3 # lxd-armhf-bos03-06 @ ps6-ra2-arm64-n1
25+ 10.145.243.9: 3 # lxd-armhf-bos03-06 @ ps6-rb1-arm64-n1
26 10.145.243.194: 3 # lxd-armhf-bos03-07 @ ps6-ra2-arm64-n1
27 10.145.243.252: 3 # lxd-armhf-bos03-08 @ ps6-ra4-arm64-n1
28 10.145.243.222: 3 # lxd-armhf-bos03-09 @ ps6-ra2-arm64-n1

Subscribers

People subscribed via source and target branches

to all changes: