diff --git a/providers/base/units/wireless/test-plan.pxu b/providers/base/units/wireless/test-plan.pxu index e47163b46c..9478e1d48d 100644 --- a/providers/base/units/wireless/test-plan.pxu +++ b/providers/base/units/wireless/test-plan.pxu @@ -42,9 +42,9 @@ include: wireless/wireless_connection_wpa_ax_nm_.* certification-status=blocker wireless/wireless_connection_wpa3_ax_nm_.* certification-status=blocker wireless/wireless_connection_open_ax_nm_.* certification-status=blocker - wireless/wireless_connection_wpa_be_nm_interface certification-status=blocker - wireless/wireless_connection_wpa3_be_nm_interface certification-status=blocker - wireless/wireless_connection_open_be_nm_interface certification-status=blocker + wireless/wireless_connection_wpa_be_nm_.* certification-status=blocker + wireless/wireless_connection_wpa3_be_nm_.* certification-status=blocker + wireless/wireless_connection_open_be_nm_.* certification-status=blocker wireless/nm_connection_restore_.* wireless/check_iwlwifi_microcode_crash_.* @@ -65,12 +65,53 @@ include: after-suspend-wireless/wireless_connection_wpa_ax_nm_.* certification-status=blocker after-suspend-wireless/wireless_connection_wpa3_ax_nm_.* certification-status=blocker after-suspend-wireless/wireless_connection_open_ax_nm_.* certification-status=blocker - wireless/wireless_connection_wpa_be_nm_interface certification-status=blocker - wireless/wireless_connection_wpa3_be_nm_interface certification-status=blocker - wireless/wireless_connection_open_be_nm_interface certification-status=blocker + after-suspend-wireless/wireless_connection_wpa_be_nm_.* certification-status=blocker + after-suspend-wireless/wireless_connection_wpa3_be_nm_.* certification-status=blocker + after-suspend-wireless/wireless_connection_open_be_nm_.* certification-status=blocker after-suspend-wireless/nm_connection_restore_.* after-suspend-wireless/check_iwlwifi_microcode_crash_.* +id: wireless-netplan-cert-automated +unit: test plan +_name: Wireless netplan tests +_description: Wireless connection tests via netplan +bootstrap_include: + device +include: + wireless/detect + wireless/wireless_connection_wpa_bg_np_.* certification-status=blocker + wireless/wireless_connection_open_bg_np_.* certification-status=blocker + wireless/wireless_connection_wpa_n_np_.* certification-status=blocker + wireless/wireless_connection_open_n_np_.* certification-status=blocker + wireless/wireless_connection_wpa_ac_np_.* certification-status=blocker + wireless/wireless_connection_open_ac_np_.* certification-status=blocker + wireless/wireless_connection_wpa_ax_np_.* certification-status=blocker + wireless/wireless_connection_wpa3_ax_np_.* certification-status=blocker + wireless/wireless_connection_open_ax_np_.* certification-status=blocker + wireless/wireless_connection_wpa_be_np_.* certification-status=blocker + wireless/wireless_connection_wpa3_be_np_.* certification-status=blocker + wireless/wireless_connection_open_be_np_.* certification-status=blocker + +id: after-suspend-wireless-netplan-cert-automated +unit: test plan +_name: Wireless netplan tests (after suspend, automated) +_description: Wireless connection tests via netplan (after suspend, automated) +bootstrap_include: + device +include: + after-suspend-wireless/wireless_connection_wpa_bg_np_.* certification-status=blocker + after-suspend-wireless/wireless_connection_open_bg_np_.* certification-status=blocker + after-suspend-wireless/wireless_connection_wpa_n_np_.* certification-status=blocker + after-suspend-wireless/wireless_connection_open_n_np_.* certification-status=blocker + after-suspend-wireless/wireless_connection_wpa_ac_np_.* certification-status=blocker + after-suspend-wireless/wireless_connection_open_ac_np_.* certification-status=blocker + after-suspend-wireless/wireless_connection_wpa_ax_np_.* certification-status=blocker + after-suspend-wireless/wireless_connection_wpa3_ax_np_.* certification-status=blocker + after-suspend-wireless/wireless_connection_open_ax_np_.* certification-status=blocker + after-suspend-wireless/wireless_connection_wpa_be_np_.* certification-status=blocker + after-suspend-wireless/wireless_connection_wpa3_be_np_.* certification-status=blocker + after-suspend-wireless/wireless_connection_open_be_np_.* certification-status=blocker + id: wireless-cert-blockers unit: test plan _name: Wireless tests (certification blockers only) @@ -89,9 +130,9 @@ include: wireless/wireless_connection_wpa_ax_nm_.* certification-status=blocker wireless/wireless_connection_wpa3_ax_nm_.* certification-status=blocker wireless/wireless_connection_open_ax_nm_.* certification-status=blocker - wireless/wireless_connection_wpa_be_nm_interface certification-status=blocker - wireless/wireless_connection_wpa3_be_nm_interface certification-status=blocker - wireless/wireless_connection_open_be_nm_interface certification-status=blocker + wireless/wireless_connection_wpa_be_nm_.* certification-status=blocker + wireless/wireless_connection_wpa3_be_nm_.* certification-status=blocker + wireless/wireless_connection_open_be_nm_.* certification-status=blocker wireless/nm_connection_restore_.* id: after-suspend-wireless-cert-blockers @@ -112,9 +153,9 @@ include: after-suspend-wireless/wireless_connection_wpa_ax_nm_.* certification-status=blocker after-suspend-wireless/wireless_connection_wpa3_ax_nm_.* certification-status=blocker after-suspend-wireless/wireless_connection_open_ax_nm_.* certification-status=blocker - wireless/wireless_connection_wpa_be_nm_interface certification-status=blocker - wireless/wireless_connection_wpa3_be_nm_interface certification-status=blocker - wireless/wireless_connection_open_be_nm_interface certification-status=blocker + after-suspend-wireless/wireless_connection_wpa_be_nm_.* certification-status=blocker + after-suspend-wireless/wireless_connection_wpa3_be_nm_.* certification-status=blocker + after-suspend-wireless/wireless_connection_open_be_nm_.* certification-status=blocker after-suspend-wireless/nm_connection_restore_.* id: wireless-full @@ -142,27 +183,27 @@ _description: include: wireless/detect certification-status=blocker wireless/wireless_scanning_.* - wireless/wireless_connection_open_be_nm_interface certification-status=blocker + wireless/wireless_connection_open_be_nm_.* certification-status=blocker wireless/wireless_connection_open_ax_nm_.* certification-status=blocker wireless/wireless_connection_open_ac_nm_.* certification-status=blocker wireless/wireless_connection_open_bg_nm_.* certification-status=blocker wireless/wireless_connection_open_n_nm_.* certification-status=blocker - wireless/wireless_connection_wpa_be_nm_interface certification-status=blocker - wireless/wireless_connection_wpa3_be_nm_interface certification-status=blocker + wireless/wireless_connection_wpa_be_nm_.* certification-status=blocker + wireless/wireless_connection_wpa3_be_nm_.* certification-status=blocker wireless/wireless_connection_wpa_ax_nm_.* certification-status=blocker wireless/wireless_connection_wpa3_ax_nm_.* certification-status=blocker wireless/wireless_connection_wpa_ac_nm_.* certification-status=blocker wireless/wireless_connection_wpa_bg_nm_.* certification-status=blocker wireless/wireless_connection_wpa_n_nm_.* certification-status=blocker - wireless/wireless_connection_open_be_np_interface certification-status=blocker + wireless/wireless_connection_open_be_np_.* certification-status=blocker wireless/wireless_connection_open_ax_np_.* certification-status=blocker wireless/wireless_connection_open_ac_np_.* certification-status=blocker wireless/wireless_connection_open_bg_np_.* certification-status=blocker wireless/wireless_connection_open_n_np_.* certification-status=blocker wireless/wireless_connection_wpa_ax_np_.* certification-status=blocker wireless/wireless_connection_wpa3_ax_np_.* certification-status=blocker - wireless/wireless_connection_wpa_be_np_interface certification-status=blocker - wireless/wireless_connection_wpa3_be_np_interface certification-status=blocker + wireless/wireless_connection_wpa_be_np_.* certification-status=blocker + wireless/wireless_connection_wpa3_be_np_.* certification-status=blocker wireless/wireless_connection_wpa_ac_np_.* certification-status=blocker wireless/wireless_connection_wpa_bg_np_.* certification-status=blocker wireless/wireless_connection_wpa_n_np_.* certification-status=blocker @@ -179,27 +220,27 @@ _description: include: wireless/detect wireless/wireless_scanning_.* - wireless/wireless_connection_open_be_nm_interface + wireless/wireless_connection_open_be_nm_.* wireless/wireless_connection_open_ax_nm_.* wireless/wireless_connection_open_ac_nm_.* wireless/wireless_connection_open_bg_nm_.* wireless/wireless_connection_open_n_nm_.* - wireless/wireless_connection_wpa_be_nm_interface - wireless/wireless_connection_wpa3_be_nm_interface + wireless/wireless_connection_wpa_be_nm_.* + wireless/wireless_connection_wpa3_be_nm_.* wireless/wireless_connection_wpa_ax_nm_.* wireless/wireless_connection_wpa3_ax_nm_.* wireless/wireless_connection_wpa_ac_nm_.* wireless/wireless_connection_wpa_bg_nm_.* wireless/wireless_connection_wpa_n_nm_.* - wireless/wireless_connection_open_be_np_interface + wireless/wireless_connection_open_be_np_.* wireless/wireless_connection_open_ax_np_.* wireless/wireless_connection_open_ac_np_.* wireless/wireless_connection_open_bg_np_.* wireless/wireless_connection_open_n_np_.* wireless/wireless_connection_wpa_ax_np_.* wireless/wireless_connection_wpa3_ax_np_.* - wireless/wireless_connection_wpa_be_np_interface - wireless/wireless_connection_wpa3_be_np_interface + wireless/wireless_connection_wpa_be_np_.* + wireless/wireless_connection_wpa3_be_np_.* wireless/wireless_connection_wpa_ac_np_.* wireless/wireless_connection_wpa_bg_np_.* wireless/wireless_connection_wpa_n_np_.* @@ -356,27 +397,27 @@ _description: , be networks. include: after-suspend-wireless/wireless_scanning_.* - wireless/wireless_connection_open_be_nm_interface + after-suspend-wireless/wireless_connection_open_be_nm_.* after-suspend-wireless/wireless_connection_open_ax_nm_.* after-suspend-wireless/wireless_connection_open_ac_nm_.* after-suspend-wireless/wireless_connection_open_bg_nm_.* after-suspend-wireless/wireless_connection_open_n_nm_.* - wireless/wireless_connection_wpa_be_nm_interface - wireless/wireless_connection_wpa3_be_nm_interface + after-suspend-wireless/wireless_connection_wpa_be_nm_.* + after-suspend-wireless/wireless_connection_wpa3_be_nm_.* after-suspend-wireless/wireless_connection_wpa_ax_nm_.* after-suspend-wireless/wireless_connection_wpa3_ax_nm_.* after-suspend-wireless/wireless_connection_wpa_ac_nm_.* after-suspend-wireless/wireless_connection_wpa_bg_nm_.* after-suspend-wireless/wireless_connection_wpa_n_nm_.* - wireless/wireless_connection_open_be_np_interface + after-suspend-wireless/wireless_connection_open_be_np_.* after-suspend-wireless/wireless_connection_open_ax_np_.* after-suspend-wireless/wireless_connection_open_ac_np_.* after-suspend-wireless/wireless_connection_open_bg_np_.* after-suspend-wireless/wireless_connection_open_n_np_.* after-suspend-wireless/wireless_connection_wpa_ax_np_.* after-suspend-wireless/wireless_connection_wpa3_ax_np_.* - wireless/wireless_connection_wpa_be_np_interface - wireless/wireless_connection_wpa3_be_np_interface + after-suspend-wireless/wireless_connection_wpa_be_np_.* + after-suspend-wireless/wireless_connection_wpa3_be_np_.* after-suspend-wireless/wireless_connection_wpa_ac_np_.* after-suspend-wireless/wireless_connection_wpa_bg_np_.* after-suspend-wireless/wireless_connection_wpa_n_np_.* @@ -392,27 +433,27 @@ _description: , be networks using netplan. include: after-suspend-wireless/wireless_scanning_.* - wireless/wireless_connection_open_be_nm_interface + after-suspend-wireless/wireless_connection_open_be_nm_.* after-suspend-wireless/wireless_connection_open_ax_nm_.* after-suspend-wireless/wireless_connection_open_ac_nm_.* after-suspend-wireless/wireless_connection_open_bg_nm_.* after-suspend-wireless/wireless_connection_open_n_nm_.* - wireless/wireless_connection_wpa_be_nm_interface - wireless/wireless_connection_wpa3_be_nm_interface + after-suspend-wireless/wireless_connection_wpa_be_nm_.* + after-suspend-wireless/wireless_connection_wpa3_be_nm_.* after-suspend-wireless/wireless_connection_wpa_ax_nm_.* after-suspend-wireless/wireless_connection_wpa3_ax_nm_.* after-suspend-wireless/wireless_connection_wpa_ac_nm_.* after-suspend-wireless/wireless_connection_wpa_bg_nm_.* after-suspend-wireless/wireless_connection_wpa_n_nm_.* - wireless/wireless_connection_open_be_np_interface + after-suspend-wireless/wireless_connection_open_be_np_.* after-suspend-wireless/wireless_connection_open_ax_np_.* after-suspend-wireless/wireless_connection_open_ac_np_.* after-suspend-wireless/wireless_connection_open_bg_np_.* after-suspend-wireless/wireless_connection_open_n_np_.* after-suspend-wireless/wireless_connection_wpa_ax_np_.* after-suspend-wireless/wireless_connection_wpa3_ax_np_.* - wireless/wireless_connection_wpa_be_np_interface - wireless/wireless_connection_wpa3_be_np_interface + after-suspend-wireless/wireless_connection_wpa_be_np_.* + after-suspend-wireless/wireless_connection_wpa3_be_np_.* after-suspend-wireless/wireless_connection_wpa_ac_np_.* after-suspend-wireless/wireless_connection_wpa_bg_np_.* after-suspend-wireless/wireless_connection_wpa_n_np_.* diff --git a/providers/base/units/wireless/wireless-connection-netplan.pxu b/providers/base/units/wireless/wireless-connection-netplan.pxu index 88d6bbe10e..12f7a11e14 100644 --- a/providers/base/units/wireless/wireless-connection-netplan.pxu +++ b/providers/base/units/wireless/wireless-connection-netplan.pxu @@ -20,7 +20,7 @@ estimated_duration: 15 flags: preserve-locale also-after-suspend requires: wireless_sta_protocol.{{ interface }}_be == 'supported' - net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd' + (net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd') or lsb.release >= "24" unit: template template-resource: device @@ -44,7 +44,7 @@ estimated_duration: 15 flags: preserve-locale also-after-suspend requires: wireless_sta_protocol.{{ interface }}_ax == 'supported' - net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd' + (net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd') or lsb.release >= "24" unit: template template-resource: device @@ -68,7 +68,7 @@ estimated_duration: 15 flags: preserve-locale also-after-suspend requires: wireless_sta_protocol.{{ interface }}_ac == 'supported' - net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd' + (net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd') or lsb.release >= "24" unit: template template-resource: device @@ -91,7 +91,7 @@ category_id: com.canonical.plainbox::wireless estimated_duration: 15 flags: preserve-locale also-after-suspend requires: - net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd' + (net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd') or lsb.release >= "24" unit: template template-resource: device @@ -114,7 +114,7 @@ category_id: com.canonical.plainbox::wireless estimated_duration: 15 flags: preserve-locale also-after-suspend requires: - net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd' + (net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd') or lsb.release >= "24" unit: template template-resource: device @@ -138,7 +138,7 @@ estimated_duration: 15 flags: preserve-locale also-after-suspend requires: wireless_sta_protocol.{{ interface }}_be == 'supported' - net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd' + (net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd') or lsb.release >= "24" unit: template template-resource: device @@ -162,7 +162,7 @@ estimated_duration: 15 flags: preserve-locale also-after-suspend requires: wireless_sta_protocol.{{ interface }}_ax == 'supported' - net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd' + (net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd') or lsb.release >= "24" unit: template template-resource: device @@ -186,7 +186,7 @@ estimated_duration: 15 flags: preserve-locale also-after-suspend requires: wireless_sta_protocol.{{ interface }}_be == 'supported' - net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd' + (net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd') or lsb.release >= "24" unit: template template-resource: device @@ -210,7 +210,7 @@ estimated_duration: 15 flags: preserve-locale also-after-suspend requires: wireless_sta_protocol.{{ interface }}_ax == 'supported' - net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd' + (net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd') or lsb.release >= "24" unit: template template-resource: device @@ -234,7 +234,7 @@ estimated_duration: 15 flags: preserve-locale also-after-suspend requires: wireless_sta_protocol.{{ interface }}_ac == 'supported' - net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd' + (net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd') or lsb.release >= "24" unit: template template-resource: device @@ -257,7 +257,7 @@ category_id: com.canonical.plainbox::wireless estimated_duration: 15 flags: preserve-locale also-after-suspend requires: - net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd' + (net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd') or lsb.release >= "24" unit: template template-resource: device @@ -280,4 +280,4 @@ category_id: com.canonical.plainbox::wireless estimated_duration: 15 flags: preserve-locale also-after-suspend requires: - net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd' + (net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd') or lsb.release >= "24" diff --git a/providers/certification-client/units/client-cert-desktop-24-04.pxu b/providers/certification-client/units/client-cert-desktop-24-04.pxu index 3b30f7b98e..61324e8a01 100644 --- a/providers/certification-client/units/client-cert-desktop-24-04.pxu +++ b/providers/certification-client/units/client-cert-desktop-24-04.pxu @@ -113,6 +113,7 @@ nested_part: usb-cert-automated usb-automated wireless-cert-automated + wireless-netplan-cert-automated # start of suspend related tests before-suspend-reference-cert-full # suspend point @@ -133,6 +134,7 @@ nested_part: after-suspend-usb-cert-automated after-suspend-usb-automated after-suspend-wireless-cert-automated + after-suspend-wireless-netplan-cert-automated after-suspend-bluetooth-cert-automated after-suspend-camera-cert-automated # The following tests should run BEFORE the automated tests. The reboot and