diff --git a/dasharo-compatibility/os-opnsense.robot b/dasharo-oses/os-opnsense.robot similarity index 88% rename from dasharo-compatibility/os-opnsense.robot rename to dasharo-oses/os-opnsense.robot index 9acc8c8d60..40207c8456 100644 --- a/dasharo-compatibility/os-opnsense.robot +++ b/dasharo-oses/os-opnsense.robot @@ -13,13 +13,13 @@ Resource ../keys.robot # Log Out And Close Connection - elementary teardown keyword for all tests. Suite Setup Run Keywords ... Prepare Test Suite +... AND +... Skip If '${ENV_ID_OPNSENSE}' not in ${TESTED_BSD_DISTROS} OPNsense tests not supported Suite Teardown Run Keywords ... Log Out And Close Connection Test Setup Run Keyword ... Restore Initial DUT Connection Method -Default Tags semiauto - *** Test Cases *** OPN001.503 Install operating system on disk (OPNsense) @@ -30,6 +30,7 @@ OPN001.503 Install operating system on disk (OPNsense) ... modification. ... ... Previous IDs: OPN001.001 + [Tags] semiauto Power On Boot OPNsense Installer VAR ${installer_message}= @@ -41,16 +42,13 @@ OPN001.503 Install operating system on disk (OPNsense) OPN002.503 Boot operating system from disk (OPNsense) [Documentation] Boot OPNsense (serial output) from disk. - ... This test depends on semi-manual OS installation, thus it's - ... marked as semiauto. + ... ... Previous IDs: OPN001.002 Power On Boot OPNsense OPN003.503 Boot operating system from disk after cold-boot (OPNsense) [Documentation] Boot OPNsense (serial output) from disk after cold-boot - ... This test depends on semi-manual OS installation, thus it's - ... marked as semiauto. ... ... Previous IDs: BOS001.001 VAR @{supported_power_ctrls}= RteCtrl sonoff @@ -64,8 +62,6 @@ OPN003.503 Boot operating system from disk after cold-boot (OPNsense) OPN004.503 Boot operating system from disk after warm-boot (OPNsense) [Documentation] Boot OPNsense (serial output) from disk after warm-boot - ... This test depends on semi-manual OS installation, thus it's - ... marked as semiauto. ... ... Previous IDs: BOS002.001 Power On @@ -81,8 +77,6 @@ OPN004.503 Boot operating system from disk after warm-boot (OPNsense) OPN005.503 Boot operating system from disk after reboot (OPNsense) [Documentation] Boot OPNsense (serial output) from disk after reboot - ... This test depends on semi-manual OS installation, thus it's - ... marked as semiauto. ... ... Previous IDs: BOS003.001 Power On diff --git a/dasharo-compatibility/os-pfsense.robot b/dasharo-oses/os-pfsense.robot similarity index 89% rename from dasharo-compatibility/os-pfsense.robot rename to dasharo-oses/os-pfsense.robot index 1561ff2381..f1bfe650a0 100644 --- a/dasharo-compatibility/os-pfsense.robot +++ b/dasharo-oses/os-pfsense.robot @@ -13,13 +13,13 @@ Resource ../keys.robot # Log Out And Close Connection - elementary teardown keyword for all tests. Suite Setup Run Keywords ... Prepare Test Suite +... AND +... Skip If '${ENV_ID_PFSENSE}' not in ${TESTED_BSD_DISTROS} pfSense tests not supported Suite Teardown Run Keywords ... Log Out And Close Connection Test Setup Run Keyword ... Restore Initial DUT Connection Method -Default Tags semiauto - *** Test Cases *** PFS001.502 Install operating system on disk (pfSense) @@ -27,6 +27,7 @@ PFS001.502 Install operating system on disk (pfSense) ... USB stick on disk. Refer to test case PFS006.502 for preseed. ... ... Previous IDs: PFS001.001 + [Tags] semiauto Power On Boot PfSense Installer VAR ${installer_message}= @@ -37,8 +38,6 @@ PFS001.502 Install operating system on disk (pfSense) PFS002.502 Boot operating system from disk (pfSense) [Documentation] Boot pfSense LTS CE (serial output) from disk. - ... This test depends on semi-manual OS installation, thus it's - ... marked as semiauto. ... ... Previous IDs: PFS001.002 Power On @@ -46,8 +45,6 @@ PFS002.502 Boot operating system from disk (pfSense) PFS003.502 Boot operating system from disk after cold-boot (pfSense) [Documentation] Boot pfSense LTS CE (serial output) from disk after cold-boot - ... This test depends on semi-manual OS installation, thus it's - ... marked as semiauto. ... ... Previous IDs: BPS001.001 VAR @{supported_power_ctrls}= RteCtrl sonoff @@ -61,8 +58,6 @@ PFS003.502 Boot operating system from disk after cold-boot (pfSense) PFS004.502 Boot operating system from disk after warm-boot (pfSense) [Documentation] Boot pfSense LTS CE (serial output) from disk after warm-boot - ... This test depends on semi-manual OS installation, thus it's - ... marked as semiauto. ... ... Previous IDs: BPS002.001 Power On @@ -78,8 +73,6 @@ PFS004.502 Boot operating system from disk after warm-boot (pfSense) PFS005.502 Boot operating system from disk after reboot (pfSense) [Documentation] Boot pfSense LTS CE (serial output) from disk after reboot - ... This test depends on semi-manual OS installation, thus it's - ... marked as semiauto. ... ... Previous IDs: BPS003.001 Power On @@ -97,6 +90,7 @@ PFS006.502 Preseed operating system installer (pfSense) ... pfSense installer to PFEFI. ... This test depends on semi-manual OS installatio media preparation, ... thus it's marked as semiauto. + [Tags] semiauto VAR ${pfefi_message}= ... Rename ESP partition of pfSense ... serial installer to PFEFI.\nOn Linux: (sudo) fatlabel /dev/sdX1 @@ -125,8 +119,6 @@ PFS006.502 Preseed operating system installer (pfSense) PFS007.502 Boot operating system installer into rescue shell (pfSense) [Documentation] Boot installer into rescue shell. - ... This test depends on semi-manual OS installatio media preparation, - ... thus it's marked as semiauto. Power On Boot PfSense Installer Enter PfSense Rescue Shell diff --git a/platform-configs/include/default.robot b/platform-configs/include/default.robot index cfddede9a1..8d05c795dc 100644 --- a/platform-configs/include/default.robot +++ b/platform-configs/include/default.robot @@ -300,6 +300,7 @@ ${DCU_SUPPORTED_BOOLEAN_SMMSTORE_VARIABLE}= NetworkBoot ${WINDOWS_SHUTDOWN_AWAITING_SECONDS}= 120 @{TESTED_LINUX_DISTROS}= ${ENV_ID_UBUNTU} +@{TESTED_BSD_DISTROS}= @{EMPTY} ${DEFAULT_BOOT_OS_ID}= ${ENV_ID_UBUNTU} ${BOOTED_OS_ID}= ${DEFAULT_BOOT_OS_ID} diff --git a/platform-configs/include/protectli-common.robot b/platform-configs/include/protectli-common.robot index d9f7197659..c6aefd2fda 100644 --- a/platform-configs/include/protectli-common.robot +++ b/platform-configs/include/protectli-common.robot @@ -42,6 +42,7 @@ ${TESTS_IN_FIRMWARE_SUPPORT}= ${TRUE} ${TESTS_IN_UBUNTU_SUPPORT}= ${TRUE} ${TESTS_IN_WINDOWS_SUPPORT}= ${TRUE} ${TESTS_IN_ESXI_SUPPORT}= ${TRUE} +@{TESTED_BSD_DISTROS}= ${ENV_ID_PFSENSE} ${ENV_ID_OPNSENSE} # Regression test flags ${DASHARO_USB_MENU_SUPPORT}= ${TRUE} diff --git a/test_cases.json b/test_cases.json index 3127ab4cf7..6115af6260 100644 --- a/test_cases.json +++ b/test_cases.json @@ -5058,7 +5058,7 @@ "doc": { "_id": "OPN001.001", "name": "OPNsense stable (serial output) installation on Hard Disk", - "module": "Dasharo Compatibility", + "module": "Dasharo OSes", "changed_to": "OPN001.503" } }, @@ -5066,7 +5066,7 @@ "doc": { "_id": "OPN001.002", "name": "Boot OPNsense stable (serial output) from Hard Disk", - "module": "Dasharo Compatibility", + "module": "Dasharo OSes", "changed_to": "OPN001.503" } }, @@ -5074,56 +5074,56 @@ "doc": { "_id": "OPN001.503", "name": "Install operating system on disk (OPNsense)", - "module": "Dasharo Compatibility" + "module": "Dasharo OSes" } }, { "doc": { "_id": "OPN002.001", "name": "OPNsense stable (VGA output) installation on Hard Disk", - "module": "Dasharo Compatibility" + "module": "Dasharo OSes" } }, { "doc": { "_id": "OPN002.002", "name": "Boot OPNsense stable (VGA output) from Hard Disk", - "module": "Dasharo Compatibility" + "module": "Dasharo OSes" } }, { "doc": { "_id": "OPN002.503", "name": "Boot operating system from disk (OPNsense)", - "module": "Dasharo Compatibility" + "module": "Dasharo OSes" } }, { "doc": { "_id": "OPN003.503", "name": "Boot operating system from disk after cold-boot (OPNsense)", - "module": "Dasharo Compatibility" + "module": "Dasharo OSes" } }, { "doc": { "_id": "OPN004.503", "name": "Boot operating system from disk after warm-boot (OPNsense)", - "module": "Dasharo Compatibility" + "module": "Dasharo OSes" } }, { "doc": { "_id": "OPN005.503", "name": "Boot operating system from disk after reboot (OPNsense)", - "module": "Dasharo Compatibility" + "module": "Dasharo OSes" } }, { "doc": { "_id": "PFS001.001", "name": "pfSense stable (serial output) installation on Hard Disk", - "module": "Dasharo Compatibility", + "module": "Dasharo OSes", "changed_to": "PFS001.502" } }, @@ -5131,7 +5131,7 @@ "doc": { "_id": "PFS001.002", "name": "Boot pfSense stable (serial output) from Hard Disk", - "module": "Dasharo Compatibility", + "module": "Dasharo OSes", "changed_to": "PFS002.502" } }, @@ -5139,63 +5139,63 @@ "doc": { "_id": "PFS001.502", "name": "Install operating system on disk (pfSense)", - "module": "Dasharo Compatibility" + "module": "Dasharo OSes" } }, { "doc": { "_id": "PFS002.001", "name": "pfSense stable (VGA output) installation on Hard Disk", - "module": "Dasharo Compatibility" + "module": "Dasharo OSes" } }, { "doc": { "_id": "PFS002.002", "name": "Boot pfSense stable (VGA output) from Hard Disk", - "module": "Dasharo Compatibility" + "module": "Dasharo OSes" } }, { "doc": { "_id": "PFS002.502", "name": "Boot operating system from disk (pfSense)", - "module": "Dasharo Compatibility" + "module": "Dasharo OSes" } }, { "doc": { "_id": "PFS003.502", "name": "Boot operating system from disk after cold-boot (pfSense)", - "module": "Dasharo Compatibility" + "module": "Dasharo OSes" } }, { "doc": { "_id": "PFS004.502", "name": "Boot operating system from disk after warm-boot (pfSense)", - "module": "Dasharo Compatibility" + "module": "Dasharo OSes" } }, { "doc": { "_id": "PFS005.502", "name": "Boot operating system from disk after reboot (pfSense)", - "module": "Dasharo Compatibility" + "module": "Dasharo OSes" } }, { "doc": { "_id": "PFS006.502", "name": "Preseed operating system installer (pfSense)", - "module": "Dasharo Compatibility" + "module": "Dasharo OSes" } }, { "doc": { "_id": "PFS007.502", "name": "Boot operating system installer into rescue shell (pfSense)", - "module": "Dasharo Compatibility" + "module": "Dasharo OSes" } }, {