tests: Mount ESP before operations

Following coreos/fedora-coreos-config#794,
the ESP will no longer be mounted in /boot. Adjust tests to mount
it before reading from it.

Author: kelvinfan001

tests/e2e-adopt/e2e-adopt-in-vm.sh

@@ -80,10 +80,13 @@ if test "$semode" != Enforcing; then
     fatal "SELinux mode is ${semode}"
 fi
 
-source_grub_cfg=$(find /boot/efi/EFI -name grub.cfg)
+# Mount the EFI partition.
+mount_tmp_efi
+
+source_grub_cfg=$(find ${tmpefimount}/EFI -name grub.cfg)
 test -f "${source_grub_cfg}"
 
-source_grub=$(find /boot/efi/EFI -name grubx64.efi)
+source_grub=$(find ${tmpefimount}/EFI -name grubx64.efi)
 test -f ${source_grub}
 source_grub_sha256=$(sha256sum ${source_grub} | cut -f 1 -d ' ')
 

tests/e2e-update/e2e-update-in-vm.sh

@@ -64,12 +64,15 @@ bootupctl status --print-if-available > out.txt
 assert_file_has_content_literal 'out.txt' 'Updates available: EFI'
 ok update avail
 
-assert_not_has_file /boot/efi/EFI/fedora/test-bootupd.efi
+# Mount the EFI partition.
+mount_tmp_efi
+
+assert_not_has_file ${tmpefimount}/EFI/fedora/test-bootupd.efi
 
 bootupctl update | tee out.txt
 assert_file_has_content out.txt "Updated EFI: ${TARGET_GRUB_PKG}.*,test-bootupd-payload-1.0"
 
-assert_file_has_content /boot/efi/EFI/fedora/test-bootupd.efi test-payload
+assert_file_has_content ${tmpefimount}/EFI/fedora/test-bootupd.efi test-payload
 
 bootupctl status --print-if-available > out.txt
 if test -s out.txt; then

tests/e2e-update/e2e-update.sh

@@ -21,8 +21,11 @@ test -f ${bootupd_git}/systemd/bootupd.service
 testtmp=$(mktemp -d -p /var/tmp bootupd-e2e.XXXXXXX)
 export test_tmpdir=${testtmp}
 
+# Mount the EFI partition.
+mount_tmp_efi
+
 # This is new content for our update
-test_bootupd_payload_file=/boot/efi/EFI/fedora/test-bootupd.efi
+test_bootupd_payload_file=${tmpefimount}/EFI/fedora/test-bootupd.efi
 build_rpm test-bootupd-payload \
   files ${test_bootupd_payload_file} \
   install "mkdir -p %{buildroot}/$(dirname ${test_bootupd_payload_file})

tests/kola/data/libtest.sh

@@ -81,3 +81,10 @@ assert_not_file_has_content_literal () {
     done
 }
 
+# Mount the EFI partition at a temporary location.
+tmpefimount=/tmp/efi
+efipart=/dev/disk/by-partlabel/EFI-SYSTEM
+mount_tmp_efi () {
+    mkdir -p ${tmpefimount}
+    mount ${efipart} ${tmpefimount}
+}

tests/kola/test-bootupd

@@ -20,15 +20,16 @@ function cleanup () {
 }
 
 bootmount=/boot
-bootefimount=${bootmount}/efi
-bootefidir=${bootefimount}/EFI
+tmpefimount=/tmp/efi
+tmpefidir=${tmpefimount}/EFI
 bootupdir=/usr/lib/bootupd/updates
 efiupdir=${bootupdir}/EFI
 ostbaseefi=/usr/lib/ostree-boot/efi/EFI
 efisubdir=fedora
 efidir=${efiupdir}/${efisubdir}
 ostefi=${ostbaseefi}/${efisubdir}
 shim=shimx64.efi
+efipart=/dev/disk/by-partlabel/EFI-SYSTEM
 
 test -f "${efidir}/${shim}"
 
@@ -102,25 +103,25 @@ ok status after update
 bootupctl validate | tee out.txt
 ok validate after update
 
+# Mount the EFI partition.
+mkdir -p ${tmpefimount}
+mount ${efipart} ${tmpefimount}
 # FIXME see above
-# assert_file_has_content ${bootefidir}/${efisubdir}/somenew.efi 'somenewfile'
-if test -f ${bootefidir}/${efisubdir}/shim.efi; then 
+# assert_file_has_content ${tmpefidir}/${efisubdir}/somenew.efi 'somenewfile'
+if test -f ${tmpefidir}/${efisubdir}/shim.efi; then 
   fatal "failed to remove file"
 fi
-if ! grep -q 'bootupd-test-changes' ${bootefidir}/${efisubdir}/grubx64.efi; then
+if ! grep -q 'bootupd-test-changes' ${tmpefidir}/${efisubdir}/grubx64.efi; then
   fatal "failed to update modified file"
 fi
-cmp ${bootefidir}/${efisubdir}/shimx64.efi ${efiupdir}/${efisubdir}/shimx64.efi
+cmp ${tmpefidir}/${efisubdir}/shimx64.efi ${efiupdir}/${efisubdir}/shimx64.efi
 ok filesystem changes
 
 bootupctl update | tee out.txt
 assert_file_has_content_literal out.txt 'No update available for any component'
 assert_not_file_has_content_literal out.txt 'Updated EFI'
 
-# Ensure /boot and /boot/efi can be written to
-mount -o remount,rw ${bootmount}
-mount -o remount,rw ${bootefimount}
-echo "some additions" >> ${bootefidir}/${efisubdir}/shimx64.efi
+echo "some additions" >> ${tmpefidir}/${efisubdir}/shimx64.efi
 if bootupctl validate 2>err.txt; then
   fatal "unexpectedly passed validation"
 fi