Merge ~paride/autopkgtest-cloud:eary-partition-setup into autopkgtest-cloud:master

[Paride Legovini]

[Paride Legovini (paride)]

Tested by following the steps to create a new arm64 node. Seems to be working fine:

# cloud-init status
status: done

# df -h
Filesystem Size Used Avail Use% Mounted on
/dev/sda1 9.4G 3.5G 6.0G 37% /

[Brian Murray (brian-murray)]

My testing of this doesn't actually show the btrfs partition being created specifically I see no evidence that the following commands ran:

 - echo 'mkpart primary btrfs 8495MB 100%\n' | parted /dev/sda
 - for timeout in `seq 10`; do [ -e /dev/sda2 ] && break; sleep 1; done

 - mkfs.btrfs -L autopkgtest /dev/sda2

I checked /dev/sda using fdisk and parted.

review: Needs Information

[Brian Murray (brian-murray)]

> My testing of this doesn't actually show the btrfs partition being created
> specifically I see no evidence that the following commands ran:
>
> - echo 'mkpart primary btrfs 8495MB 100%\n' | parted /dev/sda
> - for timeout in `seq 10`; do [ -e /dev/sda2 ] && break; sleep 1; done
>
> - mkfs.btrfs -L autopkgtest /dev/sda2
>
> I checked /dev/sda using fdisk and parted.

Oh it actually works with the original sizes, so this is on me.

[Paride Legovini (paride)]

It doesn't work with the increased btrfs partition size because of the wrong padding between partitions (the thing I was mentioning on MM). I get output similar to this from parted (it's in the cloud-init logs):

Warning: You requested a partition from 10.0GB to 107GB (sectors
19531250..209715199).
The closest location we can manage is 10.6GB to 107GB (sectors
20686848..209715166).

and then the partition is *not* created. By manually trying I found out that a 600MB padding works with a 10GB root partition:

- echo 'mkpart primary btrfs 10600MB 100%\n' | parted /dev/sda

This is kind of ugly and arbitrary, the difference may be due to one tool using MB and the other MiB.

[Brian Murray (brian-murray)]

review: Approve

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 440b2e4..4e432c3 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
@@ -114,8 +114,7 @@ write_files:
 # use gdisk to fix GPT partition table to span the whole disk
 # http://askubuntu.com/questions/446991/gparted-claims-whole-hard-drive-is-unallocated-and-gives-warning-about-gpt-table
 # then create new ~ 80 GB partition and mount it as /srv
-# use compat_uts_machine=armv7l so that 'linux32 uname -m' shows armv7l, like the buildds
-runcmd:
+bootcmd:
  - printf 'x\ne\nw\ny\n' | gdisk /dev/sda
  - printf "d\n1\nn\n\n\n+8000M\n\n\nw\ny\n" | gdisk /dev/sda
  - partprobe
@@ -125,6 +124,8 @@ runcmd:
  - echo 'mkpart primary btrfs 8495MB 100%\n' | parted /dev/sda
  - for timeout in `seq 10`; do [ -e /dev/sda2 ] && break; sleep 1; done
 
+# use compat_uts_machine=armv7l so that 'linux32 uname -m' shows armv7l, like the buildds
+runcmd:
  - mkfs.btrfs -L autopkgtest /dev/sda2
  - systemctl stop snap.lxd.daemon.service snap.lxd.daemon.unix.socket
  - echo 'LABEL=autopkgtest   /srv   btrfs defaults 0 0' >> /etc/fstab