Skip to content

Commit

Permalink
bootupd-validate: remove condition as we have newer bootupd
Browse files Browse the repository at this point in the history
  • Loading branch information
HuijingHei committed Dec 18, 2024
1 parent 930f58d commit 1d78f61
Showing 1 changed file with 3 additions and 7 deletions.
10 changes: 3 additions & 7 deletions tests/kola/boot/bootupd-validate
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 none 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 until 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

0 comments on commit 1d78f61

Please sign in to comment.