Skip to content

Commit

Permalink
tests: remove check for bootx64.efi in boot in uc-update-assets-secur…
Browse files Browse the repository at this point in the history
…e-add-sbat (#14877)

* tests: added condition that only checks grubx64.efi if bootx64.efi does not exist

* tests: remove bootx64.efi from expected files if uc22

* tests: removed /run/mnt/ubuntu-boot/EFI/boot/bootx64.efi testing from all systems
  • Loading branch information
maykathm authored and pedronis committed Jan 22, 2025
1 parent ff98281 commit 911bf5a
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions tests/nested/manual/uc-update-assets-secure-add-sbat/task.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -124,27 +124,30 @@ prepare: |
fi
cat <<EOF >>expected-before
${old_shim_sha} */run/mnt/ubuntu-boot/EFI/boot/bootx64.efi
${old_grub_sha} */run/mnt/ubuntu-boot/EFI/boot/grubx64.efi
EOF
if [ "${UPDATE_BOOT}" = true ]; then
cat <<EOF >>expected-after
${new_shim_sha} */run/mnt/ubuntu-boot/EFI/boot/bootx64.efi
${new_grub_sha} */run/mnt/ubuntu-boot/EFI/boot/grubx64.efi
EOF
else
cat <<EOF >>expected-after
${old_shim_sha} */run/mnt/ubuntu-boot/EFI/boot/bootx64.efi
${old_grub_sha} */run/mnt/ubuntu-boot/EFI/boot/grubx64.efi
EOF
fi
snap pack pc --filename=pc_2.snap
remote.exec systemctl --wait is-system-running || true
remote.wait-for snap-command
remote.exec "sudo snap wait system seed.loaded"
debug: |
cat expected-before
cat expected-after
for file in $(remote.exec "find /run/mnt/ubuntu-boot/EFI/ -name '*.efi'"); do remote.exec "sha256sum $file"; done
for file in $(remote.exec "find /run/mnt/ubuntu-seed/EFI/ -name '*.efi'"); do remote.exec "sha256sum $file"; done
execute: |
remote.exec "sha256sum -c" <expected-before
Expand Down

0 comments on commit 911bf5a

Please sign in to comment.