← Back to team overview

canonical-ubuntu-qa team mailing list archive

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

 

Skia has proposed merging ~hyask/autopkgtest-cloud:skia/lxd_remotes_kernel into autopkgtest-cloud:master.

Requested reviews:
  Canonical's Ubuntu QA (canonical-ubuntu-qa)

For more details, see:
https://code.launchpad.net/~hyask/autopkgtest-cloud/+git/autopkgtest-cloud/+merge/468338

See bug #2067633 for a description of the issue we faced. This works around the problem for all future LXD remotes.
-- 
Your team Canonical's Ubuntu QA is requested to review the proposed merge of ~hyask/autopkgtest-cloud:skia/lxd_remotes_kernel into autopkgtest-cloud:master.
diff --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
index 9141db5..471684a 100644
--- a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/armhf-lxd.userdata
+++ b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/tools/armhf-lxd.userdata
@@ -158,7 +158,9 @@ runcmd:
  - sed -i '/GRUB_CMDLINE_LINUX=/ { s/quiet splash//; s/"$/ compat_uts_machine=armv7l systemd.unified_cgroup_hierarchy=false "/ }' /etc/default/grub
  - update-grub
 
- - apt-get install -y linux-image-generic
+ # --install-suggests brings us linux-modules-extra, required for some netplan tests
+ # linux-virtual-hwe-22.04 works around LP#2067633
+ - apt-get install -y --install-suggests linux-virtual-hwe-22.04
  - apt-get purge --auto-remove -y linux-headers-generic rsyslog mlocate
  - dpkg -P `dpkg -l linux-headers* | grep ^ii | awk '{print $2}'`
  - adduser ubuntu lxd
diff --git a/mojo/service-bundle b/mojo/service-bundle
index ae507f8..7628c14 100644
--- a/mojo/service-bundle
+++ b/mojo/service-bundle
@@ -165,7 +165,7 @@ applications:
                 10.145.243.202: 3  #  lxd-armhf-bos03-03  @  ps6-rb1-arm64-n1
                 10.145.243.27:  3  #  lxd-armhf-bos03-04  @  ps6-ra2-arm64-n1
                 10.145.243.234: 3  #  lxd-armhf-bos03-05  @  ps6-rb1-arm64-n1
-                10.145.243.233: 3  #  lxd-armhf-bos03-06  @  ps6-ra2-arm64-n1
+                10.145.243.9:   3  #  lxd-armhf-bos03-06  @  ps6-rb1-arm64-n1
                 10.145.243.194: 3  #  lxd-armhf-bos03-07  @  ps6-ra2-arm64-n1
                 10.145.243.252: 3  #  lxd-armhf-bos03-08  @  ps6-ra4-arm64-n1
                 10.145.243.222: 3  #  lxd-armhf-bos03-09  @  ps6-ra2-arm64-n1

References