Merge #369802 from ~jocave/plainbox-provider-checkbox:temp-disable-net-if-mgrsnap-2019-07-09T1159

2 files changed, 17 insertions, 17 deletions

diff --git a/units/wireless/jobs.pxu b/units/wireless/jobs.pxu
index aa0b691..a997285 100644
--- a/units/wireless/jobs.pxu
+++ b/units/wireless/jobs.pxu
@@ -27,10 +27,10 @@ _description:
 Check system can find a wireless network AP nearby
 flags: preserve-locale also-after-suspend also-after-suspend-manual
 requires:
- net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'NetworkManager'
 {%- 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
@@ -49,10 +49,10 @@ category_id: com.canonical.plainbox::wireless
 estimated_duration: 30.0
 flags: preserve-locale also-after-suspend also-after-suspend-manual
 requires:
- net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'NetworkManager'
 {%- 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
@@ -71,10 +71,10 @@ category_id: com.canonical.plainbox::wireless
 estimated_duration: 30.0
 flags: preserve-locale also-after-suspend also-after-suspend-manual
 requires:
- net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'NetworkManager'
 {%- 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
@@ -93,10 +93,10 @@ category_id: com.canonical.plainbox::wireless
 estimated_duration: 30.0
 flags: preserve-locale also-after-suspend also-after-suspend-manual
 requires:
- net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'NetworkManager'
 {%- 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
@@ -115,10 +115,10 @@ category_id: com.canonical.plainbox::wireless
 estimated_duration: 30.0
 flags: preserve-locale also-after-suspend also-after-suspend-manual
 requires:
- net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'NetworkManager'
 {%- 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
@@ -138,10 +138,10 @@ estimated_duration: 30.0
 flags: preserve-locale also-after-suspend also-after-suspend-manual
 requires:
 wireless_sta_protocol.{{ interface }}_ac == 'supported'
- net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'NetworkManager'
 {%- 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
@@ -161,10 +161,10 @@ estimated_duration: 30.0
 flags: preserve-locale also-after-suspend also-after-suspend-manual
 requires:
 wireless_sta_protocol.{{ interface }}_ac == 'supported'
- net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'NetworkManager'
 {%- 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
diff --git a/units/wireless/wireless-connection-netplan.pxu b/units/wireless/wireless-connection-netplan.pxu
index a19f825..6811b43 100644
--- a/units/wireless/wireless-connection-netplan.pxu
+++ b/units/wireless/wireless-connection-netplan.pxu
@@ -19,7 +19,7 @@ estimated_duration: 15
 flags: preserve-locale also-after-suspend also-after-suspend-manual
 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'
 
 
 
@@ -42,8 +42,8 @@ environ: LD_LIBRARY_PATH OPEN_BG_SSID NET_DRIVER_INFO
 category_id: com.canonical.plainbox::wireless
 estimated_duration: 15
 flags: preserve-locale also-after-suspend also-after-suspend-manual
-requires:
- net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd'
+#requires:
+# net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd'
 
 
 unit: template
@@ -65,8 +65,8 @@ environ: LD_LIBRARY_PATH OPEN_N_SSID NET_DRIVER_INFO
 category_id: com.canonical.plainbox::wireless
 estimated_duration: 15
 flags: preserve-locale also-after-suspend also-after-suspend-manual
-requires:
- net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd'
+#requires:
+# net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd'
 
 
 unit: template
@@ -90,7 +90,7 @@ estimated_duration: 15
 flags: preserve-locale also-after-suspend also-after-suspend-manual
 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'
 
 
 unit: template
@@ -112,8 +112,8 @@ environ: LD_LIBRARY_PATH WPA_BG_SSID WPA_BG_PSK NET_DRIVER_INFO
 category_id: com.canonical.plainbox::wireless
 estimated_duration: 15
 flags: preserve-locale also-after-suspend also-after-suspend-manual
-requires:
- net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd'
+#requires:
+# net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd'
 
 
 unit: template
@@ -135,5 +135,5 @@ environ: LD_LIBRARY_PATH WPA_N_SSID WPA_N_PSK NET_DRIVER_INFO
 category_id: com.canonical.plainbox::wireless
 estimated_duration: 15
 flags: preserve-locale also-after-suspend also-after-suspend-manual
-requires:
- net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd'
+#requires:
+# net_if_management.device == '{{ interface }}' and net_if_management.managed_by == 'networkd'