Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bootupd-validate: remove condition as we have newer bootupd #3300

Merged
merged 1 commit into from
Dec 19, 2024
Merged

bootupd-validate: remove condition as we have newer bootupd #3300

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions tests/kola/boot/bootupd-validate
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ set -xeuo pipefail
. "$KOLA_EXT_DATA/commonlib.sh"

overwrite=
bootupd_version=$(rpm -q --queryformat '%{VERSION}' bootupd)
required_version='0.2.22'
# only x64 and aarch64 have esp device
overwrite_file() {
case "$(arch)" in
Expand All @@ -40,7 +38,7 @@ overwrite_file() {
overwrite=1
;;
*)
echo "skipped overwrite"
echo "skipped overwrite on platform without esp device"
;;
esac
}
Expand All @@ -64,9 +62,7 @@ validate() {

case "$(arch)" in
x86_64)
if vergte "${bootupd_version}" "${required_version}"; then
bootupctl validate | grep "${msg_bios}"
fi
bootupctl validate | grep "${msg_bios}"
bootupctl validate | grep "${msg_efi}"
;;
aarch64)
Expand All @@ -81,7 +77,7 @@ validate() {
esac
}

# should remove this until https://issues.redhat.com/browse/RHEL-66584 is fixed
# should remove this when https://issues.redhat.com/browse/RHEL-70849 is fixed
set_selinux_permissve() {
source /etc/os-release
if is_scos || [ "$(get_rhel_ver)" = "9.6" ]; then
Expand Down
Loading