Skip to content

Commit 46c2392

Browse files
committed
BOOTED_OS_ID: Change all occurrences to global
The Booted OS does not magically return back to the default one after a suite ends. The variable must be global in every context. Signed-off-by: Filip Gołaś <[email protected]>
1 parent a84ecc4 commit 46c2392

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

lib/bios/menus.robot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1290,7 +1290,7 @@ Boot System Or From Connected Disk # robocop: off=too-long-keyword
12901290
[Arguments] ${env_id} ${boot_menu}=NOT_SET
12911291
${system_name}= Get From Dictionary ${ENV_ID_OS_BOOTMENU_NAMES} ${env_id}
12921292

1293-
VAR ${BOOTED_OS_ID}= ${env_id} scope=SUITE
1293+
VAR ${BOOTED_OS_ID}= ${env_id} scope=GLOBAL
12941294
Import Variables ${CURDIR}/../../os-config/${env_id}-credentials.py
12951295

12961296
IF '${DUT_CONNECTION_METHOD}' == 'SSH' RETURN

lib/bsd.robot

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Boot PfSense Installer
1717
Write Into Terminal vt100
1818
Read From Terminal Until [Accept]
1919
Press Enter
20-
VAR ${BOOTED_OS_ID}= ${ENV_ID_PFSENSE} scope=SUITE
20+
VAR ${BOOTED_OS_ID}= ${ENV_ID_PFSENSE} scope=GLOBAL
2121
Import Variables ${CURDIR}/../os-config/${BOOTED_OS_ID}-credentials.py
2222

2323
Boot OPNsense Installer
@@ -29,7 +29,7 @@ Boot OPNsense Installer
2929
Execute File In File Explorer bootx64.efi
3030
Read From Terminal Until FreeBSD/amd64 (OPNsense.localdomain) (ttyu0)
3131
Read From Terminal Until login:
32-
VAR ${BOOTED_OS_ID}= ${ENV_ID_OPNSENSE} scope=SUITE
32+
VAR ${BOOTED_OS_ID}= ${ENV_ID_OPNSENSE} scope=GLOBAL
3333
Import Variables ${CURDIR}/../os-config/${BOOTED_OS_ID}-credentials.py
3434

3535
Enter PfSense Shell
@@ -65,7 +65,7 @@ Boot PfSense
6565
Execute File In File Explorer boot
6666
Execute File In File Explorer bootx64.efi
6767
Read From Terminal Until Enter an option:
68-
VAR ${BOOTED_OS_ID}= ${ENV_ID_PFSENSE} scope=SUITE
68+
VAR ${BOOTED_OS_ID}= ${ENV_ID_PFSENSE} scope=GLOBAL
6969
Import Variables ${CURDIR}/../os-config/${BOOTED_OS_ID}-credentials.py
7070

7171
Boot OPNsense
@@ -76,5 +76,5 @@ Boot OPNsense
7676
Execute File In File Explorer boot
7777
Execute File In File Explorer bootx64.efi
7878
Read From Terminal Until FreeBSD/amd64 (OPNsense.localdomain) (ttyu0)
79-
VAR ${BOOTED_OS_ID}= ${ENV_ID_OPNSENSE} scope=SUITE
79+
VAR ${BOOTED_OS_ID}= ${ENV_ID_OPNSENSE} scope=GLOBAL
8080
Import Variables ${CURDIR}/../os-config/${BOOTED_OS_ID}-credentials.py

lib/dcu.robot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ DCU Variable Set UEFI Option In DUT
9595
DCU Variable Set UEFI Option In File tpm.rom ${option_name} ${value}
9696
DCU Variable Flash SMMSTORE tpm.rom
9797
Execute Reboot Command
98-
VAR ${BOOTED_OS_ID}= ${DEFAULT_BOOT_OS_ID} scope=SUITE
98+
VAR ${BOOTED_OS_ID}= ${DEFAULT_BOOT_OS_ID} scope=GLOBAL
9999
Import Variables ${CURDIR}/../os-config/${BOOTED_OS_ID}-credentials.py
100100
Sleep 20s
101101

lib/options/options-lib_dcu.robot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ Boot System Or From Connected Disk
202202
Write Into Terminal reboot
203203

204204
Import Variables ${CURDIR}/../../os-config/${env_id}-credentials.py
205-
VAR ${BOOTED_OS_ID}= ${env_id} scope=SUITE
205+
VAR ${BOOTED_OS_ID}= ${env_id} scope=GLOBAL
206206
Sleep 30s
207207

208208
Login To Windows Via SSH

0 commit comments

Comments
 (0)