From 23dd1e3717dcad405701ac7b885eba5a47a3fe8a Mon Sep 17 00:00:00 2001 From: Mateusz Maciejewski Date: Tue, 19 Aug 2025 12:06:12 +0200 Subject: [PATCH] Temporary changes for NUC BOX MTL testing, do not merge. Signed-off-by: Mateusz Maciejewski --- keywords.robot | 2 +- lib/options/options-lib_uefi-setup-menu.robot | 2 +- lib/terminal.robot | 2 +- os-config/202-credentials.py | 2 +- platform-configs/include/default.robot | 1 + platform-configs/include/novacustom-nuc_box.robot | 2 +- platform-configs/novacustom-nuc_box-125H.robot | 11 +++++++++++ platform-configs/novacustom-nuc_box-155H.robot | 1 + variables.robot | 7 ++++++- 9 files changed, 24 insertions(+), 6 deletions(-) mode change 100644 => 100755 platform-configs/novacustom-nuc_box-155H.robot diff --git a/keywords.robot b/keywords.robot index b4ac33a7c1..29b7cc2dab 100644 --- a/keywords.robot +++ b/keywords.robot @@ -551,7 +551,7 @@ Prepare To SSH Connection ... sections if the communication with the platform based on ... the SSH protocol # tu leci zmiana, musimy brać platformy zgodnie z tym co zostało pobrane w dasharo - Open Connection And Log In + # Open Connection And Log In VAR ${PLATFORM}= ${CONFIG} scope=GLOBAL IF '${DEFAULT_BOOT_OS_ID}' Import Variables ${CURDIR}/os-config/${DEFAULT_BOOT_OS_ID}-credentials.py diff --git a/lib/options/options-lib_uefi-setup-menu.robot b/lib/options/options-lib_uefi-setup-menu.robot index d1a3e55867..5062f1ab8c 100644 --- a/lib/options/options-lib_uefi-setup-menu.robot +++ b/lib/options/options-lib_uefi-setup-menu.robot @@ -91,7 +91,7 @@ Measure Coldboot Time # Do one more iteration than requested, as we may hit first boot which is always longer. FOR ${index} IN RANGE 0 ${iterations}+1 Power Cycle On - Boot System Or From Connected Disk ${os_id} + # Boot System Or From Connected Disk ${os_id} Login To Linux Switch To Root User ${boot_time}= Get Boot Time From Cbmem diff --git a/lib/terminal.robot b/lib/terminal.robot index e4406ffbd5..c4502e7cdf 100644 --- a/lib/terminal.robot +++ b/lib/terminal.robot @@ -65,7 +65,7 @@ Set DUT Response Timeout ${prev_timeout}= Telnet.Set Timeout ${timeout} ELSE IF '${DUT_CONNECTION_METHOD}' in ['SSH', 'open-bmc'] ${con}= Get Connection - VAR ${prev_timeout}= ${con.timeout}= + VAR ${prev_timeout}= ${con.timeout} SSHLibrary.Set Client Configuration timeout=${timeout} ELSE FAIL Unknown connection method: ${DUT_CONNECTION_METHOD} diff --git a/os-config/202-credentials.py b/os-config/202-credentials.py index d6a1698171..9bf6d63cf4 100644 --- a/os-config/202-credentials.py +++ b/os-config/202-credentials.py @@ -4,7 +4,7 @@ DEVICE_OS_USERNAME = "linux" DEVICE_OS_PASSWORD = "linux" -DEVICE_OS_HOSTNAME = "3mdeb" +DEVICE_OS_HOSTNAME = "fedora" DEVICE_OS_USER_PROMPT = f"[{DEVICE_OS_USERNAME}@{DEVICE_OS_HOSTNAME} ~]$" DEVICE_OS_ROOT_PROMPT = f"[root@{DEVICE_OS_HOSTNAME} {DEVICE_OS_USERNAME}]#" diff --git a/platform-configs/include/default.robot b/platform-configs/include/default.robot index f51c3aafc8..7a82a13cde 100644 --- a/platform-configs/include/default.robot +++ b/platform-configs/include/default.robot @@ -40,6 +40,7 @@ ${SB_ERROR_STRING}= The image signature is inval # See: https://github.com/Dasharo/dasharo-issues/issues/614 ${LAPTOP_EC_SERIAL_WORKAROUND}= ${FALSE} +${LAPTOP_PLATFORM}= ${TBD} # Library config # Option library: UEFI configuration variable backend. diff --git a/platform-configs/include/novacustom-nuc_box.robot b/platform-configs/include/novacustom-nuc_box.robot index da075ae93c..5d0e09ef3d 100644 --- a/platform-configs/include/novacustom-nuc_box.robot +++ b/platform-configs/include/novacustom-nuc_box.robot @@ -17,7 +17,7 @@ ${WIFI_CARD}= Intel Corporation Meteor Lake PCH CNVi W ${DEFAULT_BOOT_OS_ID}= ${ENV_ID_UBUNTU} @{TESTED_LINUX_DISTROS}= -... ${ENV_ID_UBUNTU} # ${ENV_ID_FEDORA} +... ${ENV_ID_UBUNTU} ${TESTS_IN_WINDOWS_SUPPORT}= ${TRUE} ${CLEVO_USB_C_HUB}= Billboard Device diff --git a/platform-configs/novacustom-nuc_box-125H.robot b/platform-configs/novacustom-nuc_box-125H.robot index 85b804505c..08eaeff9ea 100644 --- a/platform-configs/novacustom-nuc_box-125H.robot +++ b/platform-configs/novacustom-nuc_box-125H.robot @@ -6,6 +6,17 @@ Resource include/default.robot *** Variables *** +${INITIAL_DUT_CONNECTION_METHOD}= SSH +${DUT_CONNECTION_METHOD}= SSH +${POWER_CTRL}= sonoff +# ${OPTIONS_LIB}= options-lib_dcu +${TESTS_IN_FIRMWARE_SUPPORT}= ${FALSE} +${LAPTOP_PLATFORM}= ${FALSE} + +${DEFAULT_BOOT_OS_ID}= ${ENV_ID_FEDORA} +@{TESTED_LINUX_DISTROS}= +... ${ENV_ID_FEDORA} + ${CPU}= Intel(R) Core(TM) Ultra 5 125H ${DEF_CORES_PER_SOCKET}= 14 ${DEF_THREADS_TOTAL}= 18 diff --git a/platform-configs/novacustom-nuc_box-155H.robot b/platform-configs/novacustom-nuc_box-155H.robot old mode 100644 new mode 100755 index 03ce0a2253..e296290ec1 --- a/platform-configs/novacustom-nuc_box-155H.robot +++ b/platform-configs/novacustom-nuc_box-155H.robot @@ -14,6 +14,7 @@ ${DEF_THREADS_TOTAL}= 22 # TODO: remove, the value below can be inferred from the one above ${DEF_ONLINE_CPU}= 0-21 ${DEF_SOCKETS}= 1 +${LAPTOP_PLATFORM}= ${FALSE} ${CPU_MAX_FREQUENCY}= 4800 ${CPU_MIN_FREQUENCY}= 200 diff --git a/variables.robot b/variables.robot index e1cabfe70e..128beca381 100644 --- a/variables.robot +++ b/variables.robot @@ -273,6 +273,11 @@ ${OS_UBUNTU}= ubuntu ... platform_vendor=Clevo ... sonoff_ip=192.168.10.229 +# NovaCustom NUC BOX desktop +&{RTE74}= ip=192.168.10.254 +... platform=novacustom-nuc_box +... platform_vendor=Clevo + @{RTE_LIST}= &{RTE05} &{RTE06} &{RTE07} &{RTE08} &{RTE09} ... &{RTE10} &{RTE11} &{RTE12} &{RTE13} &{RTE14} ... &{RTE15} &{RTE16} &{RTE17} &{RTE18} &{RTE19} @@ -286,7 +291,7 @@ ${OS_UBUNTU}= ubuntu ... &{RTE55} &{RTE56} &{RTE57} &{RTE58} &{RTE59} ... &{RTE60} &{RTE61} &{RTE62} &{RTE63} &{RTE64} ... &{RTE65} &{RTE66} &{RTE67} &{RTE68} &{RTE69} -... &{RTE70} &{RTE71} &{RTE72} &{RTE73} +... &{RTE70} &{RTE71} &{RTE72} &{RTE73} &{RTE74} # hardware database: # -----------------------------------------------------------------------------