Skip to content

Commit d1a468a

Browse files
committed
OWR*.206: OpenWrt image stored in osfv-test-data
Power control logics removed, os image moved to osfv test data and uploadet to DUT (DTS) via SSH. Signed-off-by: Mateusz Maciejewski <[email protected]>
1 parent 8feebcb commit d1a468a

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

dasharo-compatibility/os-openwrt.robot

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,11 @@ Default Tags semiauto
2525
OWR001.206 Install operating system on disk (OpenWrt)
2626
[Documentation] This test installs OpenWrt on NVMe drive using dd program.
2727
... DTS is boot via iPXE and OpenWrt image is downloaded using wget.
28-
... OPENWRT_IMAGE_LINK - image link to download via wget
2928
... OPENWRT_IMAGE_FILE - core of file name
3029
... OPENWRT_TARGET_DEVICE - target drive to be wiped out using dd (!)
3130
[Tags] semiauto
3231
Skip If not ${TESTS_IN_OPENWRT_SUPPORT} OWR001.206 not supported
3332
Variable Should Exist ${OPENWRT_TARGET_DEVICE}
34-
Variable Should Exist ${OPENWRT_IMAGE_LINK}
3533
Variable Should Exist ${OPENWRT_IMAGE_FILE}
3634
${selection}= Get Selection From User
3735
... Caution! You are about to install OpenWrt on ${OPENWRT_TARGET_DEVICE} device. Are you sure?
@@ -42,12 +40,18 @@ OWR001.206 Install operating system on disk (OpenWrt)
4240
Power On
4341
Make Sure That Network Boot Is Enabled
4442
Boot Dasharo Tools Suite iPXE
43+
# Starting SSH server
44+
Write Bare Into Terminal K
45+
Read From Terminal Until Press Enter to continue.
46+
Press Enter
4547
Enter Shell In DTS
4648
VAR ${openwrt_image_gz}= ${OPENWRT_IMAGE_FILE} .gz separator=${EMPTY}
4749
Remove File ${openwrt_image_gz}
4850
Remove File ${OPENWRT_IMAGE_FILE}
49-
Download File OpenWrt ${OPENWRT_IMAGE_LINK} ${openwrt_image_gz}
50-
Execute Linux Command gunzip ${openwrt_image_gz} | dd of=/dev/${OPENWRT_TARGET_DEVICE} bs=1M
51+
VAR ${DEVICE_OS_USERNAME}= root scope=TEST
52+
VAR ${DEVICE_OS_PASSWORD}= ${EMPTY} scope=TEST
53+
Send File To DUT osfv-test-data/openwrt/${openwrt_image_gz} /${openwrt_image_gz}
54+
Execute Linux Command gzip -cdk ${openwrt_image_gz} | dd of=/dev/${OPENWRT_TARGET_DEVICE} bs=1M
5155
Execute Linux Command sync
5256
Execute Reboot Command
5357
Boot OpenWrt
@@ -70,8 +74,6 @@ OWR002.206 Boot operating system from disk (OpenWrt)
7074
OWR003.206 Boot operating system from disk after cold-boot (OpenWrt)
7175
[Documentation] Boot OpenWrt from hard disk after cold-boot.
7276
Skip If not ${TESTS_IN_OPENWRT_SUPPORT} OWR003.206 not supported
73-
VAR @{supported_power_ctrls}= RteCtrl sonoff
74-
Skip If '${POWER_CTRL}' not in ${supported_power_ctrls}
7577
Power On
7678
Boot OpenWrt
7779
Execute Cold Boot

platform-configs/include/default.robot

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,6 @@ ${CAPSULE_UPDATE_SUPPORT}= ${FALSE}
264264
${TRENCHBOOT_SUPPORT}= ${FALSE}
265265

266266
# OpenWRT-specific variables
267-
${OPENWRT_IMAGE_LINK}= ${TBD}
268267
${OPENWRT_IMAGE_FILE}= ${TBD}
269268
${OPENWRT_TARGET_DEVICE}= ${TBD}
270269
${OPENWRT_ETHERNET_CONTROLLER}= ${TBD}

platform-configs/include/protectli-common.robot

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,6 @@ ${STABILITY_DETECTION_REBOOT_ITERATIONS}= 5
144144
${STABILITY_DETECTION_SUSPEND_ITERATIONS}= 5
145145

146146
# OpenWRT-specific variables
147-
${OPENWRT_IMAGE_LINK}= https://cloud.3mdeb.com/public.php/dav/files/nfC3WGaqCCzHmck
148147
${OPENWRT_IMAGE_FILE}= openwrt_combined_efi.img
149148
${OPENWRT_TARGET_DEVICE}= nvme0n1
150149
${OPENWRT_ETHERNET_CONTROLLER}= Intel Corporation Ethernet Controller

0 commit comments

Comments
 (0)