From 837d12df1d1832899ca25ff0c7baa04391ba511a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Lewi=C5=84ski?= Date: Mon, 20 Jan 2025 18:28:23 +0100 Subject: [PATCH 01/11] keywords.robot: add suport for checking power LED MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Filip Lewiński --- keywords.robot | 12 ++++++++++++ platform-configs/include/default.robot | 1 + platform-configs/include/protectli-common.robot | 1 + platform-configs/minnowboard-turbot.robot | 1 + requirements.txt | 2 +- 5 files changed, 16 insertions(+), 1 deletion(-) diff --git a/keywords.robot b/keywords.robot index 322c42aa50..b90970c12f 100644 --- a/keywords.robot +++ b/keywords.robot @@ -745,6 +745,18 @@ Power Cycle On END IF '${DEFAULT_POWER_STATE_AFTER_FAIL}' == 'Powered Off' Rte Power On + IF '${CHECK_POWER_LED_SUPPORT}' == '${TRUE}' + FOR ${i} IN RANGE 5 + ${out}= Rte Check Power Led + IF '${out}' == 'high' RETURN + Sleep 1s + END + IF '${out}' != 'high' + FAIL Power LED didn't light up! Setup needs manual verification, + ... or Power State After Power Failure is set incorrectly. + END + END + OBMC Power Cycle On [Documentation] Clears obmc-console-client buffer and perform full power ... cycle with Chassis and Host State Control diff --git a/platform-configs/include/default.robot b/platform-configs/include/default.robot index 589f0c6005..1ae7c0fad9 100644 --- a/platform-configs/include/default.robot +++ b/platform-configs/include/default.robot @@ -29,6 +29,7 @@ ${INTERNAL_PROGRAMMER_CHIPNAME}= "Opaque flash chip" ${FLASHING_METHOD}= external ${SNIPEIT}= yes ${SEABIOS_BOOT_DEVICE}= ${EMPTY} +${CHECK_POWER_LED_SUPPORT}= ${FALSE} # See: https://github.com/Dasharo/dasharo-issues/issues/614 ${LAPTOP_EC_SERIAL_WORKAROUND}= ${FALSE} diff --git a/platform-configs/include/protectli-common.robot b/platform-configs/include/protectli-common.robot index 63739a2bab..ae32502e72 100644 --- a/platform-configs/include/protectli-common.robot +++ b/platform-configs/include/protectli-common.robot @@ -20,6 +20,7 @@ ${CPU}= ${TBD} ${POWER_CTRL}= RteCtrl ${FLASH_VERIFY_METHOD}= tianocore-shell ${FLASH_VERIFY_OPTION}= UEFI Shell +${CHECK_POWER_LED_SUPPORT}= ${TRUE} ${DMIDECODE_SERIAL_NUMBER}= N/A ${DMIDECODE_MANUFACTURER}= Protectli diff --git a/platform-configs/minnowboard-turbot.robot b/platform-configs/minnowboard-turbot.robot index f768134dcf..280893c5c2 100644 --- a/platform-configs/minnowboard-turbot.robot +++ b/platform-configs/minnowboard-turbot.robot @@ -33,6 +33,7 @@ ${TESTS_IN_WINDOWS_SUPPORT}= ${FALSE} # Regression test flags ${CUSTOM_BOOT_MENU_KEY_SUPPORT}= ${TRUE} +${CHECK_POWER_LED_SUPPORT}= ${TRUE} *** Keywords *** diff --git a/requirements.txt b/requirements.txt index 8b27d8ab54..1fe6e4dd2d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -22,7 +22,7 @@ MarkupSafe==2.1.5 mdurl==0.1.2 nodeenv==1.8.0 oauth2client==4.1.3 -osfv @ git+https://github.com/Dasharo/osfv-scripts.git@36a030eb006391c3761c25d6972036a5a34fb73b#subdirectory=osfv_cli +osfv @ git+https://github.com/Dasharo/osfv-scripts.git@solve-pwon#subdirectory=osfv_cli paramiko==3.4.0 pathspec==0.9.0 pexpect==4.9.0 From efe61e16ceca2087f9f7ec035cd9e8068aa4639a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Lewi=C5=84ski?= Date: Tue, 11 Feb 2025 15:25:32 +0100 Subject: [PATCH 02/11] platform-configs: invert CHECK_POWER_LED_SUPPORT logic MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Filip Lewiński --- platform-configs/include/default.robot | 2 +- platform-configs/include/msi-z690-common.robot | 1 + platform-configs/include/novacustom-common.robot | 1 + platform-configs/include/optiplex-common.robot | 1 + platform-configs/include/protectli-common.robot | 1 - platform-configs/minnowboard-turbot.robot | 1 - 6 files changed, 4 insertions(+), 3 deletions(-) diff --git a/platform-configs/include/default.robot b/platform-configs/include/default.robot index 1ae7c0fad9..7d0d8be80a 100644 --- a/platform-configs/include/default.robot +++ b/platform-configs/include/default.robot @@ -29,7 +29,7 @@ ${INTERNAL_PROGRAMMER_CHIPNAME}= "Opaque flash chip" ${FLASHING_METHOD}= external ${SNIPEIT}= yes ${SEABIOS_BOOT_DEVICE}= ${EMPTY} -${CHECK_POWER_LED_SUPPORT}= ${FALSE} +${CHECK_POWER_LED_SUPPORT}= ${TRUE} # See: https://github.com/Dasharo/dasharo-issues/issues/614 ${LAPTOP_EC_SERIAL_WORKAROUND}= ${FALSE} diff --git a/platform-configs/include/msi-z690-common.robot b/platform-configs/include/msi-z690-common.robot index 0e911e74a1..3c25462045 100644 --- a/platform-configs/include/msi-z690-common.robot +++ b/platform-configs/include/msi-z690-common.robot @@ -25,6 +25,7 @@ ${POWER_CTRL}= sonoff ${FLASH_VERIFY_METHOD}= none ${WIFI_CARD}= ${TBD} ${MAX_CPU_TEMP}= 80 +${CHECK_POWER_LED_SUPPORT}= ${FALSE} ${DMIDECODE_MANUFACTURER}= Micro-Star International Co., Ltd. ${DMIDECODE_VENDOR}= 3mdeb diff --git a/platform-configs/include/novacustom-common.robot b/platform-configs/include/novacustom-common.robot index a08fde8c4f..1d39aa41a8 100644 --- a/platform-configs/include/novacustom-common.robot +++ b/platform-configs/include/novacustom-common.robot @@ -24,6 +24,7 @@ ${FLASH_VERIFY_METHOD}= none ${MAX_CPU_TEMP}= 82 ${AUTO_BOOT_TIME_OUT_DEFAULT_VALUE}= 6 ${FLASHING_METHOD}= internal +${CHECK_POWER_LED_SUPPORT}= ${FALSE} ${DMIDECODE_SERIAL_NUMBER}= N/A ${DMIDECODE_MANUFACTURER}= Notebook diff --git a/platform-configs/include/optiplex-common.robot b/platform-configs/include/optiplex-common.robot index 0f77045ff8..db6d8d5244 100644 --- a/platform-configs/include/optiplex-common.robot +++ b/platform-configs/include/optiplex-common.robot @@ -16,6 +16,7 @@ ${SETUP_MENU_KEY}= ${F2} ${IPXE_BOOT_ENTRY}= Network Boot and Utilities ${POWER_CTRL}= sonoff ${MAX_CPU_TEMP}= 80 +${CHECK_POWER_LED_SUPPORT}= ${FALSE} ${DMIDECODE_VENDOR}= 3mdeb ${DMIDECODE_FAMILY}= N/A diff --git a/platform-configs/include/protectli-common.robot b/platform-configs/include/protectli-common.robot index ae32502e72..63739a2bab 100644 --- a/platform-configs/include/protectli-common.robot +++ b/platform-configs/include/protectli-common.robot @@ -20,7 +20,6 @@ ${CPU}= ${TBD} ${POWER_CTRL}= RteCtrl ${FLASH_VERIFY_METHOD}= tianocore-shell ${FLASH_VERIFY_OPTION}= UEFI Shell -${CHECK_POWER_LED_SUPPORT}= ${TRUE} ${DMIDECODE_SERIAL_NUMBER}= N/A ${DMIDECODE_MANUFACTURER}= Protectli diff --git a/platform-configs/minnowboard-turbot.robot b/platform-configs/minnowboard-turbot.robot index 280893c5c2..f768134dcf 100644 --- a/platform-configs/minnowboard-turbot.robot +++ b/platform-configs/minnowboard-turbot.robot @@ -33,7 +33,6 @@ ${TESTS_IN_WINDOWS_SUPPORT}= ${FALSE} # Regression test flags ${CUSTOM_BOOT_MENU_KEY_SUPPORT}= ${TRUE} -${CHECK_POWER_LED_SUPPORT}= ${TRUE} *** Keywords *** From dce7ae67a87dac074e41f2cd3d415a5ede16519d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Lewi=C5=84ski?= Date: Tue, 11 Feb 2025 15:40:35 +0100 Subject: [PATCH 03/11] keywords.robot: change power LED polling rate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Filip Lewiński --- keywords.robot | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keywords.robot b/keywords.robot index b90970c12f..10c46efe3e 100644 --- a/keywords.robot +++ b/keywords.robot @@ -746,10 +746,10 @@ Power Cycle On IF '${DEFAULT_POWER_STATE_AFTER_FAIL}' == 'Powered Off' Rte Power On IF '${CHECK_POWER_LED_SUPPORT}' == '${TRUE}' - FOR ${i} IN RANGE 5 + FOR ${i} IN RANGE 50 ${out}= Rte Check Power Led IF '${out}' == 'high' RETURN - Sleep 1s + Sleep 0.25s END IF '${out}' != 'high' FAIL Power LED didn't light up! Setup needs manual verification, From b1d7f7049f6a123b4efc122a6e08a47a137987c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Lewi=C5=84ski?= Date: Tue, 11 Feb 2025 16:34:15 +0100 Subject: [PATCH 04/11] platform-configs/include/pcengines-seabios.robot: add MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Filip Lewiński --- platform-configs/include/pcengines-seabios.robot | 10 ++++++++++ platform-configs/include/pcengines.robot | 4 ++++ 2 files changed, 14 insertions(+) create mode 100644 platform-configs/include/pcengines-seabios.robot diff --git a/platform-configs/include/pcengines-seabios.robot b/platform-configs/include/pcengines-seabios.robot new file mode 100644 index 0000000000..6c1c624b3b --- /dev/null +++ b/platform-configs/include/pcengines-seabios.robot @@ -0,0 +1,10 @@ +*** Settings *** +Resource pcengines.robot + + +*** Variables *** +${BIOS_LIB}= seabios +${FW_STRING}= F10 +${SEABIOS_BOOT_DEVICE}= 4 +${BOOT_MENU_KEY}= ${F10} +${TESTS_IN_FIRMWARE_SUPPORT}= ${FALSE} diff --git a/platform-configs/include/pcengines.robot b/platform-configs/include/pcengines.robot index 0bfdc9086a..55565cdf16 100644 --- a/platform-configs/include/pcengines.robot +++ b/platform-configs/include/pcengines.robot @@ -102,3 +102,7 @@ ${USB_TYPE-A_DEVICES_DETECTION_SUPPORT}= ${TRUE} # Test module: trenchboot ${TRENCHBOOT_SUPPORT}= ${TRUE} + +*** Keywords *** +Power On + Power On Default From 6253d9d5cb49b84768dcdd7c74185b2b9b7af3c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Lewi=C5=84ski?= Date: Tue, 11 Feb 2025 16:38:07 +0100 Subject: [PATCH 05/11] platform-configs/pcengines-apu*-seabios.robot: add MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Filip Lewiński --- platform-configs/pcengines-apu2-seabios.robot | 6 ++++++ platform-configs/pcengines-apu3-seabios.robot | 6 ++++++ platform-configs/pcengines-apu4-seabios.robot | 6 ++++++ platform-configs/pcengines-apu6-seabios.robot | 6 ++++++ 4 files changed, 24 insertions(+) create mode 100644 platform-configs/pcengines-apu2-seabios.robot create mode 100644 platform-configs/pcengines-apu3-seabios.robot create mode 100644 platform-configs/pcengines-apu4-seabios.robot create mode 100644 platform-configs/pcengines-apu6-seabios.robot diff --git a/platform-configs/pcengines-apu2-seabios.robot b/platform-configs/pcengines-apu2-seabios.robot new file mode 100644 index 0000000000..79af3c97b4 --- /dev/null +++ b/platform-configs/pcengines-apu2-seabios.robot @@ -0,0 +1,6 @@ +*** Settings *** +Resource include/pcengines-seabios.robot + + +*** Variables *** +${DMIDECODE_PRODUCT_NAME}= apu2 diff --git a/platform-configs/pcengines-apu3-seabios.robot b/platform-configs/pcengines-apu3-seabios.robot new file mode 100644 index 0000000000..d9848c5501 --- /dev/null +++ b/platform-configs/pcengines-apu3-seabios.robot @@ -0,0 +1,6 @@ +*** Settings *** +Resource include/pcengines-seabios.robot + + +*** Variables *** +${DMIDECODE_PRODUCT_NAME}= apu3 diff --git a/platform-configs/pcengines-apu4-seabios.robot b/platform-configs/pcengines-apu4-seabios.robot new file mode 100644 index 0000000000..a526cd5249 --- /dev/null +++ b/platform-configs/pcengines-apu4-seabios.robot @@ -0,0 +1,6 @@ +*** Settings *** +Resource include/pcengines-seabios.robot + + +*** Variables *** +${DMIDECODE_PRODUCT_NAME}= apu4 diff --git a/platform-configs/pcengines-apu6-seabios.robot b/platform-configs/pcengines-apu6-seabios.robot new file mode 100644 index 0000000000..ef0e1116a4 --- /dev/null +++ b/platform-configs/pcengines-apu6-seabios.robot @@ -0,0 +1,6 @@ +*** Settings *** +Resource include/pcengines-seabios.robot + + +*** Variables *** +${DMIDECODE_PRODUCT_NAME}= apu6 From bab587f2317c035b9b7014bc6a31ecda83878cb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Lewi=C5=84ski?= Date: Tue, 25 Feb 2025 11:14:41 +0100 Subject: [PATCH 06/11] keywords.robot: switch to 0.5s when polling power LED MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Filip Lewiński --- keywords.robot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keywords.robot b/keywords.robot index 10c46efe3e..077c0a362f 100644 --- a/keywords.robot +++ b/keywords.robot @@ -749,7 +749,7 @@ Power Cycle On FOR ${i} IN RANGE 50 ${out}= Rte Check Power Led IF '${out}' == 'high' RETURN - Sleep 0.25s + Sleep 0.5s END IF '${out}' != 'high' FAIL Power LED didn't light up! Setup needs manual verification, From 59d5b5798bbeb915928705cb944335b24f975df8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Lewi=C5=84ski?= Date: Wed, 26 Feb 2025 16:55:35 +0100 Subject: [PATCH 07/11] requirements.txt: bump osfv_cli revision MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Filip Lewiński --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 1fe6e4dd2d..35c27c12be 100644 --- a/requirements.txt +++ b/requirements.txt @@ -22,7 +22,7 @@ MarkupSafe==2.1.5 mdurl==0.1.2 nodeenv==1.8.0 oauth2client==4.1.3 -osfv @ git+https://github.com/Dasharo/osfv-scripts.git@solve-pwon#subdirectory=osfv_cli +osfv @ git+https://github.com/Dasharo/osfv-scripts.git@99a9dbd9dbd7063bf25aa2ae3fe0de66eef42e39#subdirectory=osfv_cli paramiko==3.4.0 pathspec==0.9.0 pexpect==4.9.0 From 0a64c7745cf6da9e652079aa7d58a430996e5358 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Lewi=C5=84ski?= Date: Wed, 26 Feb 2025 17:00:59 +0100 Subject: [PATCH 08/11] platform-configs/: fix precommit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Filip Lewiński --- platform-configs/include/pcengines.robot | 1 + 1 file changed, 1 insertion(+) diff --git a/platform-configs/include/pcengines.robot b/platform-configs/include/pcengines.robot index 55565cdf16..118fe62b56 100644 --- a/platform-configs/include/pcengines.robot +++ b/platform-configs/include/pcengines.robot @@ -103,6 +103,7 @@ ${USB_TYPE-A_DEVICES_DETECTION_SUPPORT}= ${TRUE} # Test module: trenchboot ${TRENCHBOOT_SUPPORT}= ${TRUE} + *** Keywords *** Power On Power On Default From 34069e10aa904db3baa9178771614dfff42a0ba3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Lewi=C5=84ski?= Date: Tue, 18 Mar 2025 12:32:03 +0100 Subject: [PATCH 09/11] requirements.txt: bump osfv_cli revision MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Filip Lewiński --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 35c27c12be..492480b232 100644 --- a/requirements.txt +++ b/requirements.txt @@ -22,7 +22,7 @@ MarkupSafe==2.1.5 mdurl==0.1.2 nodeenv==1.8.0 oauth2client==4.1.3 -osfv @ git+https://github.com/Dasharo/osfv-scripts.git@99a9dbd9dbd7063bf25aa2ae3fe0de66eef42e39#subdirectory=osfv_cli +osfv @ git+https://github.com/Dasharo/osfv-scripts.git@06bf5d45b21bdec86486aba8aafd5664d470beff#subdirectory=osfv_cli paramiko==3.4.0 pathspec==0.9.0 pexpect==4.9.0 From 475e1c856f9a9c03e1e92b208e05b6a01f30abd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Lewi=C5=84ski?= Date: Tue, 10 Jun 2025 13:13:15 +0200 Subject: [PATCH 10/11] keywords.robot: switch to 10 iterations when polling power LED MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Filip Lewiński --- keywords.robot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keywords.robot b/keywords.robot index 077c0a362f..ff0485eb92 100644 --- a/keywords.robot +++ b/keywords.robot @@ -746,7 +746,7 @@ Power Cycle On IF '${DEFAULT_POWER_STATE_AFTER_FAIL}' == 'Powered Off' Rte Power On IF '${CHECK_POWER_LED_SUPPORT}' == '${TRUE}' - FOR ${i} IN RANGE 50 + FOR ${i} IN RANGE 10 ${out}= Rte Check Power Led IF '${out}' == 'high' RETURN Sleep 0.5s From 223d5c2518ce5fdd23ab7dc095edb9afe9a5334a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Lewi=C5=84ski?= Date: Wed, 25 Jun 2025 16:39:23 +0200 Subject: [PATCH 11/11] platform-configs/include/default.robot: add power off LED check MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Filip Lewiński --- platform-configs/include/default.robot | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/platform-configs/include/default.robot b/platform-configs/include/default.robot index 7d0d8be80a..0dc9216232 100644 --- a/platform-configs/include/default.robot +++ b/platform-configs/include/default.robot @@ -281,6 +281,17 @@ Power On Default IF '${DUT_CONNECTION_METHOD}' == 'SSH' RETURN Sleep 2s Rte Power Off - Sleep 10s + IF '${CHECK_POWER_LED_SUPPORT}' == '${TRUE}' + FOR ${i} IN RANGE 10 + ${out}= Rte Check Power Led + IF '${out}' == 'low' RETURN + Sleep 0.5s + END + IF '${out}' != 'low' + FAIL Power LED didn't turn off! Setup needs manual verification. + END + ELSE + Sleep 10s + END Read From Terminal Power Cycle On