Merge pull request #3751 from balena-os/alexgg/pl1000

tests: secureboot: generalize U-boot binary naming

Author: flowzone-app[bot]

meta-balena-common/recipes-support/os-helpers/os-helpers/os-helpers-fs

@@ -23,7 +23,7 @@ fi
 get_sector_size() {
 	local _device="$1"
 
-	lsblk -o NAME,PHY-SEC,TYPE "$_device" 2>/dev/null | awk '$3 == "part" || $3 == "crypt" {print $2}' | head -n1
+	lsblk -nlo NAME,PHY-SEC,TYPE "$_device" 2>/dev/null | awk '{print $2}'
 }
 
 # Wait for a file to appear with loop count limit.

tests/suites/os/tests/secureboot/index.js

@@ -454,7 +454,7 @@ class imxSecureBoot extends secureBoot {
 
 	async testBootloaderIntegrity() {
 		const tests = [
-			{ name:'Bootloader', path: '/mnt/imx/imx-boot-*.bin-flash_evk', pattern: CSF_HEADER, replacement: CSF_HEADER_BAD },
+			{ name:'Bootloader', path: '/mnt/imx/imx-boot*.bin*', pattern: CSF_HEADER, replacement: CSF_HEADER_BAD },
 			{ name:'Balena bootloader', path: '/mnt/imx/Image.gz', pattern: CSF_HEADER, replacement: CSF_HEADER_BAD },
 			{ name: 'Device trees', path: '/mnt/imx/*.dtb', pattern: CSF_HEADER, replacement: CSF_HEADER_BAD },
 		];