From e726f1f8df4d068a09fed8a373ac6ea8a24daec6 Mon Sep 17 00:00:00 2001
From: HuijingHei <hhei@redhat.com>
Date: Thu, 29 Aug 2024 17:37:36 +0800
Subject: [PATCH] tests: verify `bootupctl status` output is not empty

See https://github.com/coreos/bootupd/issues/694
---
 tests/kola/boot/bootupd             | 17 ++++++++++++++++-
 tests/kola/upgrade/extended/test.sh |  6 +++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/tests/kola/boot/bootupd b/tests/kola/boot/bootupd
index c909d6e919..d6bd554c5c 100755
--- a/tests/kola/boot/bootupd
+++ b/tests/kola/boot/bootupd
@@ -22,12 +22,22 @@ case "$(arch)" in
     aarch64|x86_64)
         # on these arches, we always expect state files to exist
         check_state_file=1
+        # aarch64 (and x86_64) uses uefi firmware, should check grub2-efi
+        evr=$(rpm -q grub2-common --qf '%{EVR}')
+        if ! bootupctl status | grep "grub2-efi-.*-${evr}"; then
+            fatal "bootupctl status output should include grub2-efi package version"
+        fi
         ;;
     ppc64le)
         # ppc64le has it if built by osbuild, otherwise not
         if [ -e /sysroot/.aleph-version.json ]; then
             check_state_file=1
         fi
+        # ppc64le (and x86_64) uses bios firmware, should check grub2-tools
+        grub_version=$(rpm -q grub2-tools --qf '%{NEVRA}')
+        if ! bootupctl status | grep "${grub_version}"; then
+            fatal "bootupctl status output should include grub2-tools package version"
+        fi
         ;& # fallthrough
     *)
         if ! rpm -q bootupd; then
@@ -41,5 +51,10 @@ if [ -n "${check_state_file}" ] && [ ! -f "${state_file}" ]; then
     fatal "${state_file} not present"
 fi
 
-bootupctl status
+# Verify `bootupctl status` output contains related content.
+# https://github.com/coreos/bootupd/issues/694
+if ! bootupctl status | grep "CoreOS aleph version"; then
+    fatal "bootupctl status output should include 'CoreOS aleph version'"
+fi
+
 ok bootupctl
diff --git a/tests/kola/upgrade/extended/test.sh b/tests/kola/upgrade/extended/test.sh
index 5eebc130a8..ca7a4685c8 100755
--- a/tests/kola/upgrade/extended/test.sh
+++ b/tests/kola/upgrade/extended/test.sh
@@ -145,7 +145,11 @@ ok "Reached version: $version"
 if vereq $version $target_version; then
     ok "Fully upgraded to $target_version"
     # log bootupctl information for inspection where available
-    [ -f /usr/bin/bootupctl ] && /usr/bin/bootupctl status
+    # and check the status output
+    [ -f /usr/bin/bootupctl ] && /usr/bin/bootupctl status | tee bootupctl.txt
+    if ! grep "CoreOS aleph version" bootupctl.txt; then
+        fatal "check bootupctl status output"
+    fi
     exit 0
 fi