Skip to content

Commit

Permalink
Remove the change of job.pux and test-plan.pxu
Browse files Browse the repository at this point in the history
  • Loading branch information
@seankingyang
seankingyang committed May 3, 2024
1 parent 3c9c503 commit 6d3913f
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 111 deletions.
87 changes: 0 additions & 87 deletions providers/base/units/wireless/jobs.pxu
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ template-engine: jinja2
template-unit: job
id: wireless/wireless_connection_wpa_bg_nm_{{ interface }}
template-id: wireless/wireless_connection_wpa_bg_nm_interface
depends: wireless/detect
_summary: Connect to WPA-encrypted 802.11b/g Wi-Fi network on {{ interface }}
_purpose:
Check system can connect to 802.11b/g AP with wpa security
Expand All @@ -66,7 +65,6 @@ template-engine: jinja2
template-unit: job
id: wireless/wireless_connection_open_bg_nm_{{ interface }}
template-id: wireless/wireless_connection_open_bg_nm_interface
depends: wireless/detect
_summary: Connect to unencrypted 802.11b/g Wi-Fi network on {{ interface }}
_purpose:
Check system can connect to insecure 802.11b/g AP
Expand All @@ -91,7 +89,6 @@ template-engine: jinja2
template-unit: job
id: wireless/wireless_connection_wpa_n_nm_{{ interface }}
template-id: wireless/wireless_connection_wpa_n_nm_interface
depends: wireless/detect
_summary: Connect to WPA-encrypted 802.11n Wi-Fi network on {{ interface }}
_purpose:
Check system can connect to 802.11n AP with wpa security
Expand All @@ -116,7 +113,6 @@ template-engine: jinja2
template-unit: job
id: wireless/wireless_connection_open_n_nm_{{ interface }}
template-id: wireless/wireless_connection_open_n_nm_interface
depends: wireless/detect
_summary: Connect to unencrypted 802.11n Wi-Fi network on {{ interface }}
_purpose:
Check system can connect to insecure 802.11n AP
Expand All @@ -141,7 +137,6 @@ template-engine: jinja2
template-unit: job
id: wireless/wireless_connection_wpa_ac_nm_{{ interface }}
template-id: wireless/wireless_connection_wpa_ac_nm_interface
depends: wireless/detect
_summary: Connect to WPA-encrypted 802.11ac Wi-Fi network on {{ interface }}
_purpose:
Check system can connect to 802.11ac AP with wpa security
Expand All @@ -167,7 +162,6 @@ template-engine: jinja2
template-unit: job
id: wireless/wireless_connection_open_ac_nm_{{ interface }}
template-id: wireless/wireless_connection_open_ac_nm_interface
depends: wireless/detect
_summary: Connect to unencrypted 802.11ac Wi-Fi network on {{ interface }}
_purpose:
Check system can connect to insecure 802.11ac AP
Expand All @@ -193,7 +187,6 @@ template-engine: jinja2
template-unit: job
id: wireless/wireless_connection_wpa_ax_nm_{{ interface }}
template-id: wireless/wireless_connection_wpa_ax_nm_interface
depends: wireless/detect
_summary: Connect to WPA-encrypted 802.11ax Wi-Fi network on {{ interface }}
_purpose:
Check system can connect to 802.11ax AP with wpa security
Expand All @@ -219,7 +212,6 @@ template-engine: jinja2
template-unit: job
id: wireless/wireless_connection_wpa3_ax_nm_{{ interface }}
template-id: wireless/wireless_connection_wpa3_ax_nm_interface
depends: wireless/detect
_summary: Connect to WPA3-encrypted 802.11ax Wi-Fi network on {{ interface }}
_purpose:
Check system can connect to 802.11ax AP with wpa3 security
Expand All @@ -244,7 +236,6 @@ template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
template-engine: jinja2
template-unit: job
id: wireless/wireless_connection_open_ax_nm_{{ interface }}
depends: wireless/detect
template-id: wireless/wireless_connection_open_ax_nm_interface
_summary: Connect to unencrypted 802.11ax Wi-Fi network on {{ interface }}
_purpose:
Expand All @@ -264,84 +255,6 @@ requires:
{%- endif %}
net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'NetworkManager'

unit: template
template-resource: device
template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
template-engine: jinja2
template-unit: job
id: wireless/wireless_connection_wpa_be_nm_{{ interface }}
template-id: wireless/wireless_connection_wpa_be_nm_interface
depends: wireless/detect
_summary: Connect to WPA-encrypted 802.11be Wi-Fi network on {{ interface }}
_purpose:
Check system can connect to 802.11be AP with wpa security
plugin: shell
user: root
command:
net_driver_info.py "$NET_DRIVER_INFO"
wifi_nmcli_test.py secured {{ interface }} "$WPA_BE_SSID" "$WPA_BE_PSK"
category_id: com.canonical.plainbox::wireless
estimated_duration: 30.0
flags: preserve-locale also-after-suspend
requires:
wireless_sta_protocol.{{ interface }}_be == 'supported'
{%- if __on_ubuntucore__ %}
connections.slot == 'network-manager:service' and connections.plug == '{{ __system_env__["SNAP_NAME"] }}:network-manager'
{%- endif %}
net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'NetworkManager'

unit: template
template-resource: device
template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
template-engine: jinja2
template-unit: job
id: wireless/wireless_connection_wpa3_be_nm_{{ interface }}
template-id: wireless/wireless_connection_wpa3_be_nm_interface
depends: wireless/detect
_summary: Connect to WPA3-encrypted 802.11be Wi-Fi network on {{ interface }}
_purpose:
Check system can connect to 802.11be AP with wpa3 security
plugin: shell
user: root
command:
net_driver_info.py "$NET_DRIVER_INFO"
wifi_nmcli_test.py secured {{ interface }} "$WPA3_BE_SSID" "$WPA3_BE_PSK" --exchange sae
category_id: com.canonical.plainbox::wireless
estimated_duration: 30.0
flags: preserve-locale also-after-suspend
requires:
wireless_sta_protocol.{{ interface }}_be == 'supported'
{%- if __on_ubuntucore__ %}
connections.slot == 'network-manager:service' and connections.plug == '{{ __system_env__["SNAP_NAME"] }}:network-manager'
{%- endif %}
net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'NetworkManager'

unit: template
template-resource: device
template-filter: device.category == 'WIRELESS' and device.interface != 'UNKNOWN'
template-engine: jinja2
template-unit: job
id: wireless/wireless_connection_open_be_nm_{{ interface }}
depends: wireless/detect
template-id: wireless/wireless_connection_open_be_nm_interface
_summary: Connect to unencrypted 802.11be Wi-Fi network on {{ interface }}
_purpose:
Check system can connect to insecure 802.11be AP
plugin: shell
user: root
command:
net_driver_info.py "$NET_DRIVER_INFO"
wifi_nmcli_test.py open {{ interface }} "$OPEN_BE_SSID"
category_id: com.canonical.plainbox::wireless
estimated_duration: 30.0
flags: preserve-locale also-after-suspend
requires:
wireless_sta_protocol.{{ interface }}_be == 'supported'
{%- if __on_ubuntucore__ %}
connections.slot == 'network-manager:service' and connections.plug == '{{ __system_env__["SNAP_NAME"] }}:network-manager'
{%- endif %}
net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'NetworkManager'

plugin: user-interact-verify
category_id: com.canonical.plainbox::wireless
id: wireless/wireless_connection_wpa_bg_manual
Expand Down
24 changes: 0 additions & 24 deletions providers/base/units/wireless/test-plan.pxu
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,6 @@ 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/nm_connection_restore_.*
wireless/check_iwlwifi_microcode_crash_.*

Expand All @@ -65,9 +62,6 @@ 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/nm_connection_restore_.*
after-suspend-wireless/check_iwlwifi_microcode_crash_.*

Expand All @@ -89,9 +83,6 @@ 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/nm_connection_restore_.*

id: after-suspend-wireless-cert-blockers
Expand All @@ -112,9 +103,6 @@ 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/nm_connection_restore_.*

id: wireless-full
Expand Down Expand Up @@ -142,13 +130,10 @@ _description:
include:
wireless/detect
wireless/wireless_scanning_.*
wireless/wireless_connection_open_be_nm_interface
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_ax_nm_.*
wireless/wireless_connection_wpa3_ax_nm_.*
wireless/wireless_connection_wpa_ac_nm_.*
Expand Down Expand Up @@ -176,13 +161,10 @@ _description:
include:
wireless/detect
wireless/wireless_scanning_.*
wireless/wireless_connection_open_be_nm_interface
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_ax_nm_.*
wireless/wireless_connection_wpa3_ax_nm_.*
wireless/wireless_connection_wpa_ac_nm_.*
Expand Down Expand Up @@ -350,13 +332,10 @@ _description:
networks.
include:
after-suspend-wireless/wireless_scanning_.*
wireless/wireless_connection_open_be_nm_interface
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_ax_nm_.*
after-suspend-wireless/wireless_connection_wpa3_ax_nm_.*
after-suspend-wireless/wireless_connection_wpa_ac_nm_.*
Expand All @@ -383,13 +362,10 @@ _description:
networks using netplan.
include:
after-suspend-wireless/wireless_scanning_.*
wireless/wireless_connection_open_be_nm_interface
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_ax_nm_.*
after-suspend-wireless/wireless_connection_wpa3_ax_nm_.*
after-suspend-wireless/wireless_connection_wpa_ac_nm_.*
Expand Down

0 comments on commit 6d3913f

Please sign in to comment.