Skip to content

Commit 8f93c83

Browse files
DaniilKlmacpijan
authored andcommitted
add BOOT_DTS_FROM_IPXE_SHELL var, add Boot Dasharo Tools Suite Via IPXE
Menu KW, discard changes to iPXE menu parsing Signed-off-by: Daniil Klimuk <[email protected]>
1 parent 2d8bec1 commit 8f93c83

File tree

4 files changed

+26
-16
lines changed

4 files changed

+26
-16
lines changed

docs/dts-tests.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Control variables:
3232
Launching example:
3333

3434
```bash
35-
robot -b command_log.txt -v snipeit:no -L TRACE -v config:qemu -v rte_ip:127.0.0.1 -v netboot_utilities_support:True -v dts_ipxe_link:http://192.168.0.102:8080/ipxe -v dpp_logs_key:'LOGS_KEY' -v dpp_download_key:'DOWNLOAD_KEY' -v dpp_password:'PASSWORD' -t "E2E006.002*" dts/dts-e2e.robot
35+
robot -b command_log.txt -v snipeit:no -L TRACE -v config:qemu -v rte_ip:127.0.0.1 -v boot_dts_from_ipxe_shell:True -v dts_ipxe_link:http://192.168.0.102:8080/ipxe -v dpp_logs_key:'LOGS_KEY' -v dpp_download_key:'DOWNLOAD_KEY' -v dpp_password:'PASSWORD' -t "E2E006.002*" dts/dts-e2e.robot
3636
```
3737

3838
> Note: replace `LOGS_KEY`, `DOWNLOAD_KEY` and `PASSWORD` with appropriate

lib/bios/menus.robot

+1-1
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,7 @@ Enter IPXE
445445
${boot_menu}= Enter Boot Menu Tianocore And Return Construction
446446
Enter Submenu From Snapshot ${boot_menu} ${IPXE_BOOT_ENTRY}
447447
IF ${NETBOOT_UTILITIES_SUPPORT} == ${TRUE}
448-
${ipxe_menu}= Get IPXE Boot Menu Construction lines_top=1
448+
${ipxe_menu}= Get IPXE Boot Menu Construction lines_top=2
449449
ELSE
450450
${ipxe_menu}= Get IPXE Boot Menu Construction
451451
END

lib/dts-lib.robot

+19-14
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,6 @@
22
Resource terminal.robot
33

44

5-
*** Variables ***
6-
# Default DTS link for iPXE boot, can be overwritten by CMD:
7-
${DTS_IPXE_LINK}= http://boot.dasharo.com/dts/dts.ipxe
8-
9-
105
*** Keywords ***
116
Boot Dasharo Tools Suite Via IPXE Shell
127
[Documentation] Boots DTS via iPXE shell by chaining script. Arguments:
@@ -18,7 +13,7 @@ Boot Dasharo Tools Suite Via IPXE Shell
1813
# 1) Check and enable network boot, it is disabled by default:
1914
Make Sure That Network Boot Is Enabled
2015

21-
# 2) Enter iPXE:
16+
# 2) Enter iPXE shell:
2217
Enter IPXE
2318

2419
# 3) Set up net card:
@@ -33,6 +28,22 @@ Boot Dasharo Tools Suite Via IPXE Shell
3328
Read From Terminal Until ok
3429
Set DUT Response Timeout 5m
3530

31+
Boot Dasharo Tools Suite Via IPXE Menu
32+
[Documentation] Boots DTS via option available in Dasharo iPXE menu.
33+
# 1) Check and enable network boot, it is disabled by default:
34+
Make Sure That Network Boot Is Enabled
35+
36+
# 2) Enter iPXE menu:
37+
${boot_menu}= Enter Boot Menu Tianocore And Return Construction
38+
Enter Submenu From Snapshot ${boot_menu} ${IPXE_BOOT_ENTRY}
39+
${ipxe_menu}= Get IPXE Boot Menu Construction
40+
41+
# 3) Boot DTS:
42+
Enter Submenu From Snapshot ${ipxe_menu} Dasharo Tools Suite
43+
Set DUT Response Timeout 5m
44+
Read From Terminal Until .cpio.gz...
45+
Read From Terminal Until ok
46+
3647
Boot Dasharo Tools Suite
3748
[Documentation] Keyword allows to boot Dasharo Tools Suite. Takes the
3849
... boot method (from USB or from iPXE) as parameter.
@@ -48,18 +59,12 @@ Boot Dasharo Tools Suite
4859
Enter Submenu From Snapshot ${boot_menu} ${USB_MODEL}
4960
END
5061
ELSE IF '${dts_booting_method}'=='iPXE'
51-
IF ${NETBOOT_UTILITIES_SUPPORT} == ${TRUE}
62+
IF ${BOOT_DTS_FROM_IPXE_SHELL} == ${TRUE} or ${NETBOOT_UTILITIES_SUPPORT} == ${TRUE}
5263
# DTS_IPXE_LINK can be defined before running tests, e.g. via CMD or
5364
# some file:
5465
Boot Dasharo Tools Suite Via IPXE Shell ${DTS_IPXE_LINK}
5566
ELSE
56-
${boot_menu}= Enter Boot Menu Tianocore And Return Construction
57-
Enter Submenu From Snapshot ${boot_menu} ${IPXE_BOOT_ENTRY}
58-
${ipxe_menu}= Get IPXE Boot Menu Construction
59-
Enter Submenu From Snapshot ${ipxe_menu} Dasharo Tools Suite
60-
Set DUT Response Timeout 5m
61-
Read From Terminal Until .cpio.gz...
62-
Read From Terminal Until ok
67+
Boot Dasharo Tools Suite Via IPXE Menu
6368
END
6469
ELSE
6570
FAIL Unknown or improper connection method: ${dts_booting_method}

platform-configs/include/default.robot

+5
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,11 @@ ${BOOT_FROM_USB_ITERATIONS_NUMBER}= 0
228228
# Sticks detection test cases
229229
${USB_DETECTION_ITERATIONS_NUMBER}= 0
230230

231+
# DTS
232+
# Default DTS link for iPXE boot, can be overwritten by CMD:
233+
${DTS_IPXE_LINK}= http://boot.dasharo.com/dts/dts.ipxe
234+
${BOOT_DTS_FROM_IPXE_SHELL}= ${FALSE}
235+
231236
# Other platform flags and counters
232237
# Cooling procedure iterations
233238
${COOLING_PROCEDURE_ITERATIONS}= 0

0 commit comments

Comments
 (0)