Merge ~paride/autopkgtest:lp1952084-mask-snapd-seeded into ~ubuntu-release/autopkgtest/+git/development:master

[Paride Legovini]

[Paride Legovini (paride)]

As mentioned this is not meant to be upstreamed. Should we want to drop this delta w.r.t. upstream we could add a generic --pre-command option autopkgtest-build-lxd, which we can then use from armhf-lxd.userdata to mask snapd.seeded.service.

[Brian Murray (brian-murray)]

review: Approve

[Paride Legovini (paride)]

This is useless without a fix for LP: #1989603, so I'm deferring merging for now.

If we switch to minimal images (for the moment only available for amd64) this won't be necessary at all.

diff --git a/tools/autopkgtest-build-lxd b/tools/autopkgtest-build-lxd
index 40c92c5..a3e12e7 100755
--- a/tools/autopkgtest-build-lxd
+++ b/tools/autopkgtest-build-lxd
@@ -69,6 +69,12 @@ setup() {
     fi
 
     sleep 5
+
+    # Workaround for LP: #1952084
+    # Drop if fixed or if we switch to minimal images in armhf-lxd.userdata.
+    # This has to go before the "we get a numeric runlevel" check below.
+    lxc exec "$CONTAINER" -- systemctl mask snapd.seeded.service --now
+
     if lxc exec "$CONTAINER" -- systemctl mask [e-mail]; then
        lxc exec "$CONTAINER" -- reboot
     fi
@@ -86,6 +92,10 @@ setup() {
         exit 1
     }
 
+    # Workaround for LP: #1989603
+    # Drop if fixed or if we switch to minimal images in armhf-lxd.userdata.
+    lxc exec "$CONTAINER" -- umount /var/snap/lxd/common/var/lib/lxcfs || true
+
     # wait until a systemd based container has networking
     if ! echo '[ ! -d /run/systemd/system ] || systemctl start network-online.target' | timeout 60 lxc exec "$CONTAINER" -- sh -e; then
         echo "Timed out waiting for container to start network-online.target" >&2