tests: fix fsck on boot on arm devices #9655
Conversation
|
sergio@cachiomachine:~/workspace/snapcore/snapd$ spread -debug external:ubuntu-core-18-arm-32:tests/core/fsck-on-boot |
|
sergio@cachiomachine:~/workspace/snapcore/snapd$ spread -debug external:ubuntu-core-20-arm-64:tests/core/fsck-on-boot |
|
Left the logs for arm devices which were tested for this PR |
tests/core/fsck-on-boot/task.yaml
Outdated
| @@ -54,7 +71,11 @@ execute: | | |||
| # Use offset 65 as FAT32 kicks in for devices larger than 32MB | |||
| printf "\x01" > one | |||
| tests.cleanup defer rm -f one | |||
| dd if=one of=/dev/sda2 seek=65 bs=1 count=1 conv=notrunc | |||
| if os.query is-core16 || os.query is-core18; then | |||
| dd if=/dev/disk/by-label/system-boot of=dirty skip=65 bs=1 count=1 conv=notrunc | |||
There was a problem hiding this comment.
minor nitpick, but instead of duplicating the whole dd command, you could instead just have the if set an environment variable for the label like this:
if os.query is-core16 || os.query is-core18; then
LABEL=system-boot
elif os.query is-core20; then
LABEL=ubuntu-seed
else
echo "unknown core system, please update test"
exit 1
fi
dd if="/dev/disk/by-label/$LABEL" of=dirty skip=65 bs=1 count=1 conv=notruncThere was a problem hiding this comment.
I guess we can skip the else branch given that the check for uc22 et al is also done above too
There was a problem hiding this comment.
/me notes that this also would be a good use for canonical/spread#83 if that ever becomes a thing
There was a problem hiding this comment.
totally agree, should be great to be able to define vars by system
tests/core/fsck-on-boot/task.yaml
Outdated
| @@ -76,12 +97,14 @@ execute: | | |||
| # chain. | |||
| unmount_vfat | |||
| cat /proc/self/mountinfo >boot1-after-umount.log | |||
| dd if=/dev/sda2 of=dirty skip=65 bs=1 count=1 conv=notrunc | |||
| if os.query is-core16 || os.query is-core18; then | |||
| dd if=/dev/disk/by-label/system-boot of=dirty skip=65 bs=1 count=1 conv=notrunc | |||
There was a problem hiding this comment.
same comment about LABEL
|
Tests after fixes: sergio@cachiomachine:~/workspace/snapcore/snapd$ spread -debug external:ubuntu-core-20-arm-64:tests/core/fsck-on-boot |
tests/core/fsck-on-boot/task.yaml
Outdated
| @@ -54,7 +87,7 @@ execute: | | |||
| # Use offset 65 as FAT32 kicks in for devices larger than 32MB | |||
| printf "\x01" > one | |||
| tests.cleanup defer rm -f one | |||
| dd if=one of=/dev/sda2 seek=65 bs=1 count=1 conv=notrunc | |||
| dd if="/dev/disk/by-label/$LABEL" of=dirty skip=65 bs=1 count=1 conv=notrunc | |||
There was a problem hiding this comment.
this is now wrong, it was
dd \
if=one \
of=/dev/... \
seek=65 \
...
and it has now become:
dd \
if=/dev/...
of=dirty \
skip=65 \
...
perhaps this line was mixed up with the one below?
There was a problem hiding this comment.
yes, thanks for checking
There was a problem hiding this comment.
@anonymouse64 updated
| @@ -76,12 +109,10 @@ execute: | | |||
| # chain. | |||
| unmount_vfat | |||
| cat /proc/self/mountinfo >boot1-after-umount.log | |||
| dd if=/dev/sda2 of=dirty skip=65 bs=1 count=1 conv=notrunc | |||
| dd if="/dev/disk/by-label/$LABEL" of=dirty skip=65 bs=1 count=1 conv=notrunc | |||
| @@ -54,7 +87,7 @@ execute: | | |||
| # Use offset 65 as FAT32 kicks in for devices larger than 32MB | |||
| printf "\x01" > one | |||
| tests.cleanup defer rm -f one | |||
| dd if=one of=/dev/sda2 seek=65 bs=1 count=1 conv=notrunc | |||
| dd if=one of="/dev/disk/by-label/$LABEL" seek=65 bs=1 count=1 conv=notrunc | |||
|
Looks good but the test fails now with: https://paste.ubuntu.com/p/GV7wDKdnpj/ on google:ubuntu-core-20-64:tests/core/fsck-on-boot But it seems that failure is unrelated to the PR I saw it failing in other PRs too. |
|
Please squash merge this for easier 2.48 cherry picks :) |
Add support for arm devices for the test fsck-on-boot