-
Notifications
You must be signed in to change notification settings - Fork 35
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add test for UEFI entry insertion from bootupd
The rpm-ostree-container installations will by default install an UEFI entry which did not happened before. However, if leavebootorder is set it shouldn't happen. Test this by extending rpm-ostree-container-bootc test with check for UEFI entry and adding a new test which will add `bootloader --leavebootorder`. This works only for Fedora Rawhide so far but it will be backported to RHEL-9 and RHEL-10.
- Loading branch information
1 parent
a790079
commit 0dba74e
Showing
4 changed files
with
130 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
#test name: rpm-ostree-container-bootorder | ||
# https://github.com/rhinstaller/anaconda/pull/5399 | ||
# | ||
# Test that ostree container installation works with leavebootorder. | ||
# In this test bootupd should be able to do dualboot. For sanity | ||
# of this test just check if bootupd is invoked with the correct | ||
# arguments. | ||
# | ||
|
||
# Use the default settings. | ||
%ksappend common/common.ks | ||
|
||
# network | ||
network --bootproto=dhcp | ||
# l10n | ||
keyboard us | ||
lang en | ||
timezone America/New_York | ||
# user confguration | ||
rootpw testcase | ||
|
||
# On Fedora enforce lvm scheme (overriding btrfs default) | ||
%ksappend storage/ostreecontainer_autopart.ks | ||
|
||
# Test if UEFI entry is not created! | ||
bootloader --leavebootorder --timeout 1 | ||
|
||
ostreecontainer --no-signature-verification --remote=test-remote --stateroot=test-stateroot --url=@KSTEST_OSTREECONTAINER_URL@ | ||
|
||
|
||
%post | ||
# check if efibootmgr don't have entry to boot from a disk | ||
efibootmgr | grep "HD(" | ||
if [ $? -eq 0 ]; then | ||
echo "EFI boot entry was created with leavebootorder: $(efibootmgr)" >> /root/RESULT | ||
fi | ||
|
||
%ksappend validation/success_if_result_empty.ks | ||
|
||
%end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,71 @@ | ||
# | ||
# Copyright (C) 2024 Red Hat, Inc. | ||
# | ||
# This copyrighted material is made available to anyone wishing to use, | ||
# modify, copy, or redistribute it subject to the terms and conditions of | ||
# the GNU General Public License v.2, or (at your option) any later version. | ||
# This program is distributed in the hope that it will be useful, but WITHOUT | ||
# ANY WARRANTY expressed or implied, including the implied warranties of | ||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General | ||
# Public License for more details. You should have received a copy of the | ||
# GNU General Public License along with this program; if not, write to the | ||
# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA | ||
# 02110-1301, USA. Any Red Hat trademarks that are incorporated in the | ||
# source code or documentation are not subject to the GNU General Public | ||
# License and may only be used or replicated with the express permission of | ||
# Red Hat, Inc. | ||
# | ||
|
||
# Ignore unused variable parsed out by tooling scripts as test tags metadata | ||
# shellcheck disable=SC2034 | ||
TESTTYPE="payload ostree bootc reboot skip-on-rhel-8" | ||
|
||
. ${KSTESTDIR}/functions.sh | ||
|
||
enable_uefi() { | ||
echo "true" | ||
} | ||
|
||
copy_interesting_files_from_system() { | ||
local disksdir | ||
disksdir="${1}" | ||
|
||
# Find disks. | ||
local args | ||
args=$(for d in ${disksdir}/disk-*img; do echo -a ${d}; done) | ||
|
||
# Use also iscsi disk if there is any. | ||
if [[ -n ${iscsi_disk_img} ]]; then | ||
args="${args} -a ${disksdir}/${iscsi_disk_img}" | ||
fi | ||
|
||
# Grab files out of the installed system while it still exists. | ||
# Grab these files: | ||
# | ||
# logs from Anaconda - whole /var/log/anaconda/ directory is copied out, | ||
# this can be used for saving specific test output | ||
# original-ks.cfg - the kickstart used for the test | ||
# anaconda-ks.cfg - the kickstart saved after installation, useful for | ||
# debugging | ||
# RESULT - file from the test | ||
# | ||
# The location of aforementioned files is different in an ostree system | ||
|
||
root_device=$(guestfish ${args} <<< " | ||
launch | ||
lvs" | \ | ||
grep root) | ||
|
||
for item in /ostree/deploy/test-stateroot/var/roothome/original-ks.cfg \ | ||
/ostree/deploy/test-stateroot/var/roothome/anaconda-ks.cfg \ | ||
/ostree/deploy/test-stateroot/var/roothome/anabot.log \ | ||
/ostree/deploy/test-stateroot/var/log/anaconda/ \ | ||
/ostree/deploy/test-stateroot/var/roothome/RESULT | ||
do | ||
guestfish ${args} <<< " | ||
launch | ||
mount ${root_device} / | ||
copy-out '${item}' '${disksdir}' | ||
" 2>/dev/null | ||
done | ||
} |