dasharo/open-source-firmware-validation
0
0
Fork 0
mirror of https://github.com/Dasharo/open-source-firmware-validation.git synced 2026-06-13 10:16:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

Use ENV_IDS for credentials files & change windows bootmenu name

Browse Source 
Signed-off-by: Filip Gołaś <filip.golas@3mdeb.com>
This commit is contained in:
Filip Gołaś
2025-03-07 16:08:18 +01:00
parent ff8f24c72a
commit e8abd7a3d2
13 changed files with 33 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dasharo-performance/custom-fan-curve.robot
+3 -3
View File
@@ -40,7 +40,7 @@ CFC001.001 Custom fan curve silent profile measure (Ubuntu)
Set UEFI Option FanCurveOption Silent
Power On
Boot System Or From Connected Disk ubuntu
Boot System Or From Connected Disk ${ENV_ID_UBUNTU}
Login To Linux
Switch To Root User
Perform Custom Fan Curve Test silent
@@ -54,7 +54,7 @@ CFC002.001 Custom fan curve performance profile measure (Ubuntu)
Set UEFI Option FanCurveOption Performance
Power On
Boot System Or From Connected Disk ubuntu
Boot System Or From Connected Disk ${ENV_ID_UBUNTU}
Login To Linux
Switch To Root User
Perform Custom Fan Curve Test performance
@@ -68,7 +68,7 @@ CFC003.001 Custom fan curve OFF profile measure (Ubuntu)
Set UEFI Option FanCurveOption Fans Off
Power On
Boot System Or From Connected Disk ubuntu
Boot System Or From Connected Disk ${ENV_ID_UBUNTU}
Login To Linux
Switch To Root User
Perform Custom Fan Curve Test off
keywords.robot
+5 -5
View File
@@ -83,7 +83,7 @@ Login To Windows
Set Test Variable ${DUT_CONNECTION_METHOD} SSH
END
IF '${DUT_CONNECTION_METHOD}' == 'SSH'
Login To Windows Via SSH ${DEVICE_WINDOWS_USERNAME} ${DEVICE_WINDOWS_PASSWORD}
Login To Windows Via SSH ${DEVICE_OS_USERNAME} ${DEVICE_OS_PASSWORD}
ELSE
Fail Login to Windows not supported. DUT_CONNECTION_METHOD must be set to SSH.
END
@@ -156,8 +156,8 @@ Login To Windows Via SSH
... username and password respectively. The optional timeout
... parameter can be used to specify how long we want to
... wait for the login prompt.
[Arguments] ${username}=${DEVICE_WINDOWS_USERNAME} ${password}=${DEVICE_WINDOWS_PASSWORD} ${timeout}=180
SSHLibrary.Open Connection ${DEVICE_IP} prompt=${DEVICE_WINDOWS_USER_PROMPT}
[Arguments] ${username}=${DEVICE_OS_USERNAME} ${password}=${DEVICE_OS_PASSWORD} ${timeout}=180
SSHLibrary.Open Connection ${DEVICE_IP} prompt=${DEVICE_OS_USER_PROMPT}
SSHLibrary.Set Client Configuration
... timeout=${timeout}
... term_type=vt100
@@ -524,8 +524,8 @@ Prepare To SSH Connection
... the SSH protocol
# tu leci zmiana, musimy brać platformy zgodnie z tym co zostało pobrane w dasharo
Set Global Variable ${PLATFORM} ${CONFIG}
IF '${DEFAULT_BOOT_OS}'
Import Variables ${CURDIR}/os-config/${DEFAULT_BOOT_OS}-credentials.py
IF '${DEFAULT_BOOT_OS_ID}'
Import Variables ${CURDIR}/os-config/${DEFAULT_BOOT_OS_ID}-credentials.py
END
SSHLibrary.Set Default Configuration timeout=60 seconds
IF '${SNIPEIT}'=='no' RETURN
lib/bios/menus.robot
+2 -2
View File
@@ -1160,8 +1160,8 @@ Boot System Or From Connected Disk # robocop: disable=too-long-keyword
[Arguments] ${env_id} ${boot_menu}=NOT_SET
${system_name}= Get From Dictionary ${ENV_ID_OS_BOOTMENU_NAMES} ${env_id}
Set Suite Variable ${BOOTED_OS} ${system_name}
Import Variables ${CURDIR}/../../os-config/${system_name}-credentials.py
Set Suite Variable ${BOOTED_OS_ID} ${env_id}
Import Variables ${CURDIR}/../../os-config/${env_id}-credentials.py
IF '${DUT_CONNECTION_METHOD}' == 'SSH' RETURN
lib/options/options-lib_dcu.robot
+8 -10
View File
@@ -138,18 +138,16 @@ Login To Windows
Boot System Or From Connected Disk
[Documentation] Keyword makes the DUT to reboot in chosen OS. There is a requirement for DUT to always reboot to Ubuntu.
[Arguments] ${env_id}
${system_name}= Get From Dictionary ${ENV_ID_OS_BOOTMENU_NAMES} ${env_id}
${os_boot_id}= Set Variable ${EMPTY}
${system_name}= Get From Dictionary ${ENV_ID_OS_BOOTMENU_NAMES} ${env_id}
${os}= Convert To Lower Case ${system_name}
${os_bootentry_name}= Get From Dictionary ${ENV_ID_OS_BOOTMENU_NAMES} ${env_id}
Import Variables ${CURDIR}/../../os-config/${BOOTED_OS}-credentials.py
Import Variables ${CURDIR}/../../os-config/${BOOTED_OS_ID}-credentials.py
Login To Linux
Switch To Root User
IF '${BOOTED_OS}' == '${os}'
IF '${BOOTED_OS_ID}' == '${env_id}'
Log Target OS already booted
RETURN
END
@@ -164,7 +162,7 @@ Boot System Or From Connected Disk
${line}= Get Substring ${line} 0 150
${line}= Convert To Lower Case ${line}
IF '${os}' in '${line}'
IF '${os_bootentry_name}' in '${line}'
${os_boot_id}= Set Variable ${line}
BREAK
END
@@ -174,8 +172,8 @@ Boot System Or From Connected Disk
Execute Command In Terminal efibootmgr --bootnext ${id}
Sleep 1s
Write Into Terminal reboot
Import Variables ${CURDIR}/../../os-config/${os}-credentials.py
Set Suite Variable ${BOOTED_OS} ${os}
Import Variables ${CURDIR}/../../os-config/${env_id}-credentials.py
Set Suite Variable ${BOOTED_OS_ID} ${env_id}
Sleep 30s
ELSE
Fail Os entry not found
@@ -184,8 +182,8 @@ Boot System Or From Connected Disk
Login To Windows Via SSH
[Documentation] Login to Windows via SSH by using provided arguments as
... username and password respectively.
[Arguments] ${username}=${DEVICE_WINDOWS_USERNAME} ${password}=${DEVICE_WINDOWS_PASSWORD} ${timeout}=180
SSHLibrary.Open Connection ${DEVICE_IP} prompt=${DEVICE_WINDOWS_USER_PROMPT}
[Arguments] ${username}=${DEVICE_OS_USERNAME} ${password}=${DEVICE_OS_PASSWORD} ${timeout}=180
SSHLibrary.Open Connection ${DEVICE_IP} prompt=${DEVICE_OS_USER_PROMPT}
SSHLibrary.Set Client Configuration
... timeout=${timeout}
... term_type=vt100
os-config/ubuntu-credentials.py → os-config/201-credentials.py
View File
os-config/fedora-credentials.py → os-config/202-credentials.py
View File
os-config/301-credentials.py
+9
View File
@@ -0,0 +1,9 @@
# SPDX-FileCopyrightText: 2025 3mdeb <contact@3mdeb.com>
#
# SPDX-License-Identifier: Apache-2.0
DEVICE_OS_USERNAME = "user"
DEVICE_OS_PASSWORD = "windows"
DEVICE_OS_USER_PROMPT = f"PS C:\\Users\\{DEVICE_OS_USERNAME}>"
DEVICE_OS_ROOT_PROMPT = f"PS C:\\Users\\{DEVICE_OS_USERNAME}>"
os-config/environment-test-ids.py
+1 -1
View File
@@ -20,6 +20,6 @@ ENV_ID_WINDOWS_11 = "301"
ENV_ID_OS_BOOTMENU_NAMES = {
ENV_ID_UBUNTU: "ubuntu",
ENV_ID_FEDORA: "fedora",
ENV_ID_WINDOWS_11: "windows",
ENV_ID_WINDOWS_11: "Windows Boot",
ENV_ID_TRENCHBOOT: "trenchboot",
}
os-config/windows-credentials.py
-9
View File
@@ -1,9 +0,0 @@
# SPDX-FileCopyrightText: 2025 3mdeb <contact@3mdeb.com>
#
# SPDX-License-Identifier: Apache-2.0
OS_USERNAME = "user"
OS_PASSWORD = "windows"
OS_USER_PROMPT = f"PS C:\\Users\\{OS_USERNAME}>"
OS_ROOT_PROMPT = f"PS C:\\Users\\{OS_USERNAME}>"
platform-configs/include/default.robot
+2 -2
View File
@@ -275,8 +275,8 @@ ${DCU_SUPPORTED_BOOLEAN_SMMSTORE_VARIABLE}= NetworkBoot
${ETH_PORTS}= ${EMPTY}
${TESTED_LINUX_DISTROS}= ${ENV_ID_UBUNTU}
${DEFAULT_BOOT_OS}= ubuntu
${BOOTED_OS}= ${DEFAULT_BOOT_OS}
${DEFAULT_BOOT_OS_ID}= ${ENV_ID_UBUNTU}
${BOOTED_OS_ID}= ${DEFAULT_BOOT_OS_ID}
*** Keywords ***
self-tests/dcu.robot
+1 -1
View File
@@ -30,7 +30,7 @@ Boot System Or From Connected Disk
Power On
Dcu.Boot System Or From Connected Disk ${ENV_ID_WINDOWS_11}
Dcu.Login To Windows Via SSH ${DEVICE_WINDOWS_USERNAME} ${DEVICE_WINDOWS_PASSWORD}
Dcu.Login To Windows Via SSH ${DEVICE_OS_USERNAME} ${DEVICE_OS_PASSWORD}
Power On
Dcu.Boot System Or From Connected Disk ${OS_UBUNTU}
trenchboot/01-without-drtm.robot
+1 -1
View File
@@ -62,7 +62,7 @@ TrenchBoot Suite Setup
Skip If not ${TESTS_IN_METATB_SUPPORT} Tests in meta-trenchboot aren't supported
Power On
Boot System Or From Connected Disk trenchboot
Boot System Or From Connected Disk ${ENV_ID_TRENCHBOOT}
Read From Terminal Until Press enter to boot the selected OS
Write Bare Into Terminal ${ENTER}
trenchboot/02-with-drtm.robot
+1 -1
View File
@@ -164,7 +164,7 @@ TrenchBoot Suite Setup
Skip If not ${TESTS_IN_METATB_SUPPORT} Tests in meta-trenchboot aren't supported
Power On
Boot System Or From Connected Disk trenchboot
Boot System Or From Connected Disk ${ENV_ID_TRENCHBOOT}
Read From Terminal Until Press enter to boot the selected OS
# Slaunch is the second boot option, pick it.
Write Bare Into Terminal ${ARROW_DOWN}