Merge ~jocave/plainbox-provider-snappy:static-check-classic into plainbox-provider-snappy:master

Proposed by Jonathan Cave
Status: Merged
Approved by: Jonathan Cave
Approved revision: 88fe26b155baa8940b1e52d02c05c2ef145a7b2f
Merged at revision: b573d2e7e80e3ce501fe856163d5f406915a9c79
Proposed branch: ~jocave/plainbox-provider-snappy:static-check-classic
Merge into: plainbox-provider-snappy:master
Diff against target: 17 lines (+4/-0)
1 file modified
units/ethernet/jobs.pxu (+4/-0)
Reviewer Review Type Date Requested Status
Sylvain Pineau (community) Approve
Review via email: mp+347452@code.launchpad.net

Description of the change

Check for nmcli executable rather than NM snap in static-configuration job

To post a comment you must log in.
Revision history for this message
Sylvain Pineau (sylvain-pineau) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/units/ethernet/jobs.pxu b/units/ethernet/jobs.pxu
index dba9bf3..5e9c211 100644
--- a/units/ethernet/jobs.pxu
+++ b/units/ethernet/jobs.pxu
@@ -254,8 +254,12 @@ plugin: shell
254estimated_duration: 2s254estimated_duration: 2s
255command: check_static {{ interface }}255command: check_static {{ interface }}
256requires:256requires:
257 {%- if __on_ubuntucore__ %}
257 snap.name == 'network-manager'258 snap.name == 'network-manager'
258 connections.slot == 'network-manager:service' and connections.plug == '{{ __system_env__["SNAP_NAME"] }}:network-manager'259 connections.slot == 'network-manager:service' and connections.plug == '{{ __system_env__["SNAP_NAME"] }}:network-manager'
260 {%- else %}
261 executable.name == 'nmcli'
262 {% endif -%}
259263
260plugin: shell264plugin: shell
261category_id: ethernet265category_id: ethernet

Subscribers

People subscribed via source and target branches