test: fix grep error

Author: HuijingHei

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

@@ -52,8 +52,9 @@ bootupctl validate
 ok validate
 
 bootupctl status | tee out.txt
+evr=$(rpm -q grub2-common --qf '%{EVR}')
 assert_file_has_content_literal out.txt 'Component EFI'
-assert_file_has_content_literal out.txt '  Installed: grub2-efi-x64-'
+assert_file_has_content_literal out.txt '  Installed: grub2-'"${evr}"
 assert_not_file_has_content out.txt '  Installed:.*test-bootupd-payload'
 assert_not_file_has_content out.txt '  Installed:.*'"${TARGET_GRUB_PKG}"
 assert_file_has_content out.txt 'Update: Available:.*'"${TARGET_GRUB_PKG}"

tests/kola/test-bootupd

@@ -41,8 +41,9 @@ prepare_efi_update() {
 }
 
 bootupctl status > out.txt
+evr=$(rpm -q grub2-common --qf '%{EVR}')
 assert_file_has_content_literal out.txt 'Component EFI'
-assert_file_has_content_literal out.txt '  Installed: grub2-efi-x64-'
+assert_file_has_content_literal out.txt '  Installed: grub2-'"${evr}"
 assert_file_has_content_literal out.txt 'Update: At latest version'
 assert_file_has_content out.txt '^CoreOS aleph version:'
 ok status
@@ -78,21 +79,21 @@ mv new.json ${bootupdir}/EFI.json
 
 bootupctl status | tee out.txt
 assert_file_has_content_literal out.txt 'Component EFI'
-assert_file_has_content_literal out.txt '  Installed: grub2-efi-x64-'
-assert_not_file_has_content out.txt '  Installed: grub2-efi-x64.*,test'
+assert_file_has_content_literal out.txt '  Installed: grub2-'"${evr}"
+assert_not_file_has_content out.txt '  Installed: grub2-.*,test'
 assert_file_has_content_literal out.txt 'Update: Available:'
 ok update avail
 
 bootupctl status --json > status.json
 jq -r '.components.EFI.installed.version' < status.json > installed.txt
-assert_file_has_content installed.txt '^grub2-efi-x64'
+assert_file_has_content installed.txt '^grub2-'"${evr}"
 
 bootupctl update | tee out.txt
-assert_file_has_content out.txt 'Updated EFI: grub2-efi-x64.*,test'
+assert_file_has_content out.txt 'Updated EFI: grub2-.*,test'
 
 bootupctl status > out.txt
 assert_file_has_content_literal out.txt 'Component EFI'
-assert_file_has_content out.txt '  Installed: grub2-efi-x64.*,test'
+assert_file_has_content out.txt '  Installed: grub2-.*,test'
 assert_file_has_content_literal out.txt 'Update: At latest version'
 ok status after update