From 43611e368a89a5d577f46accb11852385596d18e Mon Sep 17 00:00:00 2001 From: Wiktor Mowinski Date: Thu, 3 Jul 2025 19:13:51 +0200 Subject: [PATCH 1/3] dasharo-stability/capsule-update.robot: make compatible with protectli Signed-off-by: Wiktor Mowinski --- dasharo-stability/capsule-update.robot | 12 +++++++----- platform-configs/include/protectli-vp66xx.robot | 2 ++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dasharo-stability/capsule-update.robot b/dasharo-stability/capsule-update.robot index 15fec1063a..586e416100 100644 --- a/dasharo-stability/capsule-update.robot +++ b/dasharo-stability/capsule-update.robot @@ -330,11 +330,13 @@ Perform Capsule Update Write Bare Into Terminal reset Press Key N Times 1 ${ENTER} - # Confirm update by following instructions of Firmware Update Mode dialog - Read From Terminal Until ${FUM_DIALOG_TOP} - ${out}= Read From Terminal Until ${FUM_DIALOG_BOTTOM} - ${digit}= Get Key To Press ${out} - Write Bare Into Terminal ${digit} + IF "${DMIDECODE_PRODUCT_NAME}" not in ["VP6650", "VP6670"] + # Confirm update by following instructions of Firmware Update Mode dialog + Read From Terminal Until ${FUM_DIALOG_TOP} + ${out}= Read From Terminal Until ${FUM_DIALOG_BOTTOM} + ${digit}= Get Key To Press ${out} + Write Bare Into Terminal ${digit} + END Get File Name Without Extension [Arguments] ${file_path} diff --git a/platform-configs/include/protectli-vp66xx.robot b/platform-configs/include/protectli-vp66xx.robot index baf9dea0cc..6323b3bca2 100644 --- a/platform-configs/include/protectli-vp66xx.robot +++ b/platform-configs/include/protectli-vp66xx.robot @@ -32,3 +32,5 @@ ${CUSTOM_FAN_CURVE_OFF_MODE_SUPPORT}= ${TRUE} # measuring temperatures, fans etc. ${SENSORS_CONFIG_FILE}= include/sensors/protectli-vp66xx-sensors-config.yaml ${CUSTOM_FAN_CURVE_FILE}= include/sensors/protectli-vp66xx-fan-curve-config.yaml + +${CAPSULE_UPDATE_SUPPORT}= ${True} From 53b3e01db6d8f5d8884a85c59058114de907512d Mon Sep 17 00:00:00 2001 From: Wiktor Mowinski Date: Fri, 4 Jul 2025 08:49:21 +0200 Subject: [PATCH 2/3] dasharo-stability/capsule-update.robot: remove ancient text reliance Signed-off-by: Wiktor Mowinski --- dasharo-stability/capsule-update.robot | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/dasharo-stability/capsule-update.robot b/dasharo-stability/capsule-update.robot index 586e416100..1c65cecad0 100644 --- a/dasharo-stability/capsule-update.robot +++ b/dasharo-stability/capsule-update.robot @@ -32,11 +32,6 @@ Suite Teardown Run Keywords ... Log Out And Close Connection -*** Variables *** -${FUM_DIALOG_TOP}= Update Mode. All firmware write protections are disabled in this mode. -${FUM_DIALOG_BOTTOM}= The platform will automatically reboot and disable Firmware Update Mode - - *** Test Cases *** CUP001.001 Capsule Update With Wrong Keys [Documentation] Check that DUT rejects flashing a capsule signed with invalid certificate. @@ -330,14 +325,6 @@ Perform Capsule Update Write Bare Into Terminal reset Press Key N Times 1 ${ENTER} - IF "${DMIDECODE_PRODUCT_NAME}" not in ["VP6650", "VP6670"] - # Confirm update by following instructions of Firmware Update Mode dialog - Read From Terminal Until ${FUM_DIALOG_TOP} - ${out}= Read From Terminal Until ${FUM_DIALOG_BOTTOM} - ${digit}= Get Key To Press ${out} - Write Bare Into Terminal ${digit} - END - Get File Name Without Extension [Arguments] ${file_path} ${path_components}= Split String ${file_path} / From cf5cfa0334183495f1a0d713266151e7e7e8e2d7 Mon Sep 17 00:00:00 2001 From: Wiktor Mowinski Date: Fri, 4 Jul 2025 09:37:34 +0200 Subject: [PATCH 3/3] dasharo-stability/capsule-update.robot: handle windows uuid Signed-off-by: Wiktor Mowinski --- dasharo-stability/capsule-update.robot | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dasharo-stability/capsule-update.robot b/dasharo-stability/capsule-update.robot index 1c65cecad0..26083b6c48 100644 --- a/dasharo-stability/capsule-update.robot +++ b/dasharo-stability/capsule-update.robot @@ -126,6 +126,7 @@ CUP170.001 Verifying UUID (Ubuntu) CUP170.002 Verifying UUID (Windows) [Documentation] Check if UUID didn't change after Capsule Update. Skip If not ${TESTS_IN_WINDOWS_SUPPORT} CUP170.002 not supported + ${tmp}= Get Variable Value $WIN_UPDATED_UUID IF '${tmp}' == 'None' Go To Windows Prompt @@ -135,7 +136,10 @@ CUP170.002 Verifying UUID (Windows) Log To Console \n[Before Update] ${ORIGINAL_UUID} Log To Console \n[After Update] ${WIN_UPDATED_UUID} - Should Be Equal ${ORIGINAL_UUID} ${WIN_UPDATED_UUID} + Should Be True + ... '${WIN_UPDATED_UUID}' == '${ORIGINAL_UUID}' or '${WIN_UPDATED_UUID}' == '00000000-0000-0000-0000-000000000000' + ... UUID check passed + IF ${ROMHOLE_SUPPORT} == ${TRUE} Should Be Equal ${WIN_UPDATED_UUID} 00112233-4455-6677-8899-aabbccddeeff END