diff --git a/keywords.robot b/keywords.robot index 322c42aa50..ff0485eb92 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 10 + ${out}= Rte Check Power Led + IF '${out}' == 'high' RETURN + Sleep 0.5s + 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..0dc9216232 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}= ${TRUE} # See: https://github.com/Dasharo/dasharo-issues/issues/614 ${LAPTOP_EC_SERIAL_WORKAROUND}= ${FALSE} @@ -280,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 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/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..118fe62b56 100644 --- a/platform-configs/include/pcengines.robot +++ b/platform-configs/include/pcengines.robot @@ -102,3 +102,8 @@ ${USB_TYPE-A_DEVICES_DETECTION_SUPPORT}= ${TRUE} # Test module: trenchboot ${TRENCHBOOT_SUPPORT}= ${TRUE} + + +*** Keywords *** +Power On + Power On Default 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 diff --git a/requirements.txt b/requirements.txt index 8b27d8ab54..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@36a030eb006391c3761c25d6972036a5a34fb73b#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