Skip to content

Commit d9eae01

Browse files
matmaciejematmacieje
committed
TESTED_BSD_DISTROS variable introduced to default.robot
New "tested distros" variable introduced to skip BSD tests (pfSense & OPN sense). Empty list defined in default.robot. Signed-off-by: Mateusz Maciejewski <[email protected]>
1 parent 4ec4207 commit d9eae01

File tree

3 files changed

+7
-24
lines changed

3 files changed

+7
-24
lines changed

‎dasharo-compatibility/os-opnsense.robot‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,12 @@ Resource ../keys.robot
1414
Suite Setup Run Keywords
1515
... Prepare Test Suite
1616
... AND
17-
... Skip If '${ENV_ID_OPNSENSE}' not in ${TESTED_LINUX_DISTROS} OPNsense tests not supported
17+
... Skip If '${ENV_ID_OPNSENSE}' not in ${TESTED_BSD_DISTROS} OPNsense tests not supported
1818
Suite Teardown Run Keywords
1919
... Log Out And Close Connection
2020
Test Setup Run Keyword
2121
... Restore Initial DUT Connection Method
2222

23-
Default Tags semiauto
24-
2523

2624
*** Test Cases ***
2725
OPN001.503 Install operating system on disk (OPNsense)
@@ -32,6 +30,7 @@ OPN001.503 Install operating system on disk (OPNsense)
3230
... modification.
3331
...
3432
... Previous IDs: OPN001.001
33+
[Tags] semiauto
3534
Power On
3635
Boot OPNsense Installer
3736
VAR ${installer_message}=
@@ -43,16 +42,13 @@ OPN001.503 Install operating system on disk (OPNsense)
4342

4443
OPN002.503 Boot operating system from disk (OPNsense)
4544
[Documentation] Boot OPNsense (serial output) from disk.
46-
... This test depends on semi-manual OS installation, thus it's
47-
... marked as semiauto.
45+
...
4846
... Previous IDs: OPN001.002
4947
Power On
5048
Boot OPNsense
5149

5250
OPN003.503 Boot operating system from disk after cold-boot (OPNsense)
5351
[Documentation] Boot OPNsense (serial output) from disk after cold-boot
54-
... This test depends on semi-manual OS installation, thus it's
55-
... marked as semiauto.
5652
...
5753
... Previous IDs: BOS001.001
5854
VAR @{supported_power_ctrls}= RteCtrl sonoff
@@ -66,8 +62,6 @@ OPN003.503 Boot operating system from disk after cold-boot (OPNsense)
6662

6763
OPN004.503 Boot operating system from disk after warm-boot (OPNsense)
6864
[Documentation] Boot OPNsense (serial output) from disk after warm-boot
69-
... This test depends on semi-manual OS installation, thus it's
70-
... marked as semiauto.
7165
...
7266
... Previous IDs: BOS002.001
7367
Power On
@@ -83,8 +77,6 @@ OPN004.503 Boot operating system from disk after warm-boot (OPNsense)
8377

8478
OPN005.503 Boot operating system from disk after reboot (OPNsense)
8579
[Documentation] Boot OPNsense (serial output) from disk after reboot
86-
... This test depends on semi-manual OS installation, thus it's
87-
... marked as semiauto.
8880
...
8981
... Previous IDs: BOS003.001
9082
Power On

‎dasharo-compatibility/os-pfsense.robot‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,20 @@ Resource ../keys.robot
1414
Suite Setup Run Keywords
1515
... Prepare Test Suite
1616
... AND
17-
... Skip If '${ENV_ID_PFSENSE}' not in ${TESTED_LINUX_DISTROS} pfSense tests not supported
17+
... Skip If '${ENV_ID_PFSENSE}' not in ${TESTED_BSD_DISTROS} pfSense tests not supported
1818
Suite Teardown Run Keywords
1919
... Log Out And Close Connection
2020
Test Setup Run Keyword
2121
... Restore Initial DUT Connection Method
2222

23-
Default Tags semiauto
24-
2523

2624
*** Test Cases ***
2725
PFS001.502 Install operating system on disk (pfSense)
2826
[Documentation] Install pfSense LTS CE (serial output) from preseeded
2927
... USB stick on disk. Refer to test case PFS006.502 for preseed.
3028
...
3129
... Previous IDs: PFS001.001
30+
[Tags] semiauto
3231
Power On
3332
Boot PfSense Installer
3433
VAR ${installer_message}=
@@ -39,17 +38,13 @@ PFS001.502 Install operating system on disk (pfSense)
3938

4039
PFS002.502 Boot operating system from disk (pfSense)
4140
[Documentation] Boot pfSense LTS CE (serial output) from disk.
42-
... This test depends on semi-manual OS installation, thus it's
43-
... marked as semiauto.
4441
...
4542
... Previous IDs: PFS001.002
4643
Power On
4744
Boot PfSense
4845

4946
PFS003.502 Boot operating system from disk after cold-boot (pfSense)
5047
[Documentation] Boot pfSense LTS CE (serial output) from disk after cold-boot
51-
... This test depends on semi-manual OS installation, thus it's
52-
... marked as semiauto.
5348
...
5449
... Previous IDs: BPS001.001
5550
VAR @{supported_power_ctrls}= RteCtrl sonoff
@@ -63,8 +58,6 @@ PFS003.502 Boot operating system from disk after cold-boot (pfSense)
6358

6459
PFS004.502 Boot operating system from disk after warm-boot (pfSense)
6560
[Documentation] Boot pfSense LTS CE (serial output) from disk after warm-boot
66-
... This test depends on semi-manual OS installation, thus it's
67-
... marked as semiauto.
6861
...
6962
... Previous IDs: BPS002.001
7063
Power On
@@ -80,8 +73,6 @@ PFS004.502 Boot operating system from disk after warm-boot (pfSense)
8073

8174
PFS005.502 Boot operating system from disk after reboot (pfSense)
8275
[Documentation] Boot pfSense LTS CE (serial output) from disk after reboot
83-
... This test depends on semi-manual OS installation, thus it's
84-
... marked as semiauto.
8576
...
8677
... Previous IDs: BPS003.001
8778
Power On
@@ -99,6 +90,7 @@ PFS006.502 Preseed operating system installer (pfSense)
9990
... pfSense installer to PFEFI.
10091
... This test depends on semi-manual OS installatio media preparation,
10192
... thus it's marked as semiauto.
93+
[Tags] semiauto
10294
VAR ${pfefi_message}=
10395
... Rename ESP partition of pfSense
10496
... serial installer to PFEFI.\nOn Linux: (sudo) fatlabel /dev/sdX1
@@ -127,8 +119,6 @@ PFS006.502 Preseed operating system installer (pfSense)
127119

128120
PFS007.502 Boot operating system installer into rescue shell (pfSense)
129121
[Documentation] Boot installer into rescue shell.
130-
... This test depends on semi-manual OS installatio media preparation,
131-
... thus it's marked as semiauto.
132122
Power On
133123
Boot PfSense Installer
134124
Enter PfSense Rescue Shell

‎platform-configs/include/default.robot‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -300,6 +300,7 @@ ${DCU_SUPPORTED_BOOLEAN_SMMSTORE_VARIABLE}= NetworkBoot
300300
${WINDOWS_SHUTDOWN_AWAITING_SECONDS}= 120
301301

302302
@{TESTED_LINUX_DISTROS}= ${ENV_ID_UBUNTU}
303+
@{TESTED_BSD_DISTROS}= @{EMPTY}
303304
${DEFAULT_BOOT_OS_ID}= ${ENV_ID_UBUNTU}
304305
${BOOTED_OS_ID}= ${DEFAULT_BOOT_OS_ID}
305306

0 commit comments

Comments
 (0)