wireless: Use also-after-suspend-manual to create jobs depending on manual suspend

2 files changed, 28 insertions, 16 deletions

diff --git a/units/wireless/jobs.pxu b/units/wireless/jobs.pxu
index 2834c1d..e203e6c 100644
--- a/units/wireless/jobs.pxu
+++ b/units/wireless/jobs.pxu
@@ -13,7 +13,7 @@ category_id: com.canonical.plainbox::wireless
 estimated_duration: 6
 _description:
 Check system can find a wireless network AP nearby
-flags: preserve-locale also-after-suspend
+flags: preserve-locale also-after-suspend also-after-suspend-manual
 requires:
 {%- if "SNAP_NAME" in __system_env__ %}
 connections.slot == 'network-manager:service' and connections.plug == '{{ __system_env__["SNAP_NAME"] }}:network-manager'
@@ -34,7 +34,7 @@ command:
 wifi_nmcli_test secured {{ interface }} "$WPA_BG_SSID" "$WPA_BG_PSK"
 category_id: com.canonical.plainbox::wireless
 estimated_duration: 30.0
-flags: preserve-locale also-after-suspend
+flags: preserve-locale also-after-suspend also-after-suspend-manual
 requires:
 {%- if "SNAP_NAME" in __system_env__ %}
 connections.slot == 'network-manager:service' and connections.plug == '{{ __system_env__["SNAP_NAME"] }}:network-manager'
@@ -55,7 +55,7 @@ command:
 wifi_nmcli_test open {{ interface }} "$OPEN_BG_SSID"
 category_id: com.canonical.plainbox::wireless
 estimated_duration: 30.0
-flags: preserve-locale also-after-suspend
+flags: preserve-locale also-after-suspend also-after-suspend-manual
 requires:
 {%- if "SNAP_NAME" in __system_env__ %}
 connections.slot == 'network-manager:service' and connections.plug == '{{ __system_env__["SNAP_NAME"] }}:network-manager'
@@ -76,7 +76,7 @@ command:
 wifi_nmcli_test secured {{ interface }} "$WPA_N_SSID" "$WPA_N_PSK"
 category_id: com.canonical.plainbox::wireless
 estimated_duration: 30.0
-flags: preserve-locale also-after-suspend
+flags: preserve-locale also-after-suspend also-after-suspend-manual
 requires:
 wireless_sta_protocol.{{ interface }}_n == 'supported'
 {%- if "SNAP_NAME" in __system_env__ %}
@@ -98,7 +98,7 @@ command:
 wifi_nmcli_test open {{ interface }} "$OPEN_N_SSID"
 category_id: com.canonical.plainbox::wireless
 estimated_duration: 30.0
-flags: preserve-locale also-after-suspend
+flags: preserve-locale also-after-suspend also-after-suspend-manual
 requires:
 wireless_sta_protocol.{{ interface }}_n == 'supported'
 {%- if "SNAP_NAME" in __system_env__ %}
@@ -120,7 +120,7 @@ command:
 wifi_nmcli_test secured {{ interface }} "$WPA_AC_SSID" "$WPA_AC_PSK"
 category_id: com.canonical.plainbox::wireless
 estimated_duration: 30.0
-flags: preserve-locale also-after-suspend
+flags: preserve-locale also-after-suspend also-after-suspend-manual
 requires:
 wireless_sta_protocol.{{ interface }}_ac == 'supported'
 {%- if "SNAP_NAME" in __system_env__ %}
@@ -142,7 +142,7 @@ command:
 wifi_nmcli_test open {{ interface }} "$OPEN_AC_SSID"
 category_id: com.canonical.plainbox::wireless
 estimated_duration: 30.0
-flags: preserve-locale also-after-suspend
+flags: preserve-locale also-after-suspend also-after-suspend-manual
 requires:
 wireless_sta_protocol.{{ interface }}_ac == 'supported'
 {%- if "SNAP_NAME" in __system_env__ %}
diff --git a/units/wireless/test-plan.pxu b/units/wireless/test-plan.pxu
index e1b6cfd..ee921df 100644
--- a/units/wireless/test-plan.pxu
+++ b/units/wireless/test-plan.pxu
@@ -12,7 +12,7 @@ _name: Wireless tests (after suspend)
 _description: Wireless connection tests (after suspend)
 include:
 nested_part:
- after-suspend-wireless-cert-automated
+ after-suspend-manual-wireless-cert-automated
 
 id: wireless-cert-automated
 unit: test plan
@@ -39,6 +39,18 @@ include:
 after-suspend-wireless/wireless_connection_wpa_ac_nm_.* certification-status=blocker
 after-suspend-wireless/wireless_connection_open_ac_nm_.* certification-status=blocker
 
+id: after-suspend-manual-wireless-cert-automated
+unit: test plan
+_name: Wireless tests (after manual suspend, automated)
+_description: Wireless connection tests (after manual suspend, automated)
+include:
+ after-suspend-manual-wireless/wireless_connection_wpa_bg_nm_.* certification-status=blocker
+ after-suspend-manual-wireless/wireless_connection_open_bg_nm_.* certification-status=blocker
+ after-suspend-manual-wireless/wireless_connection_wpa_n_nm_.* certification-status=blocker
+ after-suspend-manual-wireless/wireless_connection_open_n_nm_.* certification-status=blocker
+ after-suspend-manual-wireless/wireless_connection_wpa_ac_nm_.* certification-status=blocker
+ after-suspend-manual-wireless/wireless_connection_open_ac_nm_.* certification-status=blocker
+
 id: wireless-cert-blockers
 unit: test plan
 _name: Wireless tests (certification blockers only)
@@ -54,13 +66,13 @@ include:
 
 id: after-suspend-wireless-cert-blockers
 unit: test plan
-_name: Wireless tests (after suspend, certification blockers only)
+_name: Wireless tests (after manual suspend, certification blockers only)
 _description:
- Wireless connection tests (after suspend, certification blockers only)
+ Wireless connection tests (after manual suspend, certification blockers only)
 include:
- after-suspend-wireless/wireless_connection_wpa_bg_nm_.* certification-status=blocker
- after-suspend-wireless/wireless_connection_open_bg_nm_.* certification-status=blocker
- after-suspend-wireless/wireless_connection_wpa_n_nm_.* certification-status=blocker
- after-suspend-wireless/wireless_connection_open_n_nm_.* certification-status=blocker
- after-suspend-wireless/wireless_connection_wpa_ac_nm_.* certification-status=blocker
- after-suspend-wireless/wireless_connection_open_ac_nm_.* certification-status=blocker
+ after-suspend-manual-wireless/wireless_connection_wpa_bg_nm_.* certification-status=blocker
+ after-suspend-manual-wireless/wireless_connection_open_bg_nm_.* certification-status=blocker
+ after-suspend-manual-wireless/wireless_connection_wpa_n_nm_.* certification-status=blocker
+ after-suspend-manual-wireless/wireless_connection_open_n_nm_.* certification-status=blocker
+ after-suspend-manual-wireless/wireless_connection_wpa_ac_nm_.* certification-status=blocker
+ after-suspend-manual-wireless/wireless_connection_open_ac_nm_.* certification-status=blocker