Merge ~sylvain-pineau/plainbox-provider-snappy:fix-1748371 into plainbox-provider-snappy:master

[Sylvain Pineau]

Fixes linked bug

Requires: https://code.launchpad.net/~sylvain-pineau/checkbox-ng/+git/checkbox-ng/+merge/337988

[Maciej Kisielewski (kissiel)]

Looks good (one uber-minor nitpick inline).
+1 once the env in templating lands.

review: Approve

[Devices Certification Bot (ce-certification-qa)]

The merge was fine but running tests failed.

[trusty] starting container
[trusty] (timing) 0.00user 0.00system 0:00.13elapsed 6%CPU (0avgtext+0avgdata 4916maxresident)k
[trusty] (timing) 136inputs+72outputs (0major+1411minor)pagefaults 0swaps
[trusty] provisioning container
[trusty] (timing) 40.70user 12.94system 2:11.99elapsed 40%CPU (0avgtext+0avgdata 68300maxresident)k
[trusty] (timing) 658256inputs+2036816outputs (619major+1455018minor)pagefaults 0swaps
[trusty-testing] Starting tests...
Found a test script: ./requirements/container-tests-provider-snappy
[trusty-testing] container-tests-provider-snappy: FAIL
[trusty-testing] stdout: https://paste.ubuntu.com/p/jWcSkzkkwy/
[trusty-testing] stderr: https://paste.ubuntu.com/p/zbSCxMGKpD/
[trusty-testing] (timing) Command exited with non-zero status 1
[trusty-testing] (timing) 10.84user 0.66system 0:27.80elapsed 41%CPU (0avgtext+0avgdata 74600maxresident)k
[trusty-testing] (timing) 9952inputs+85424outputs (21major+62302minor)pagefaults 0swaps
[trusty-testing] Fixing file permissions in source directory
[trusty-testing] Destroying container
Name: trusty-testing
State: STOPPED
[xenial] starting container
[xenial] (timing) 0.00user 0.00system 0:00.16elapsed 4%CPU (0avgtext+0avgdata 5148maxresident)k
[xenial] (timing) 240inputs+72outputs (1major+1433minor)pagefaults 0swaps
[xenial] provisioning container
[xenial] (timing) 58.11user 10.24system 2:17.64elapsed 49%CPU (0avgtext+0avgdata 107680maxresident)k
[xenial] (timing) 775912inputs+2443968outputs (609major+2554894minor)pagefaults 0swaps
[xenial-testing] Starting tests...
Found a test script: ./requirements/container-tests-provider-snappy
[xenial-testing] container-tests-provider-snappy: FAIL
[xenial-testing] stdout: https://paste.ubuntu.com/p/4TJyFW5KZM/
[xenial-testing] stderr: https://paste.ubuntu.com/p/k6HBngFbPm/
[xenial-testing] (timing) Command exited with non-zero status 1
[xenial-testing] (timing) 9.32user 0.51system 0:24.87elapsed 39%CPU (0avgtext+0avgdata 69120maxresident)k
[xenial-testing] (timing) 10216inputs+85424outputs (28major+54683minor)pagefaults 0swaps
[xenial-testing] Fixing file permissions in source directory
[xenial-testing] Destroying container
Name: xenial-testing
State: STOPPED

review: Needs Fixing

diff --git a/units/wwan/jobs.pxu b/units/wwan/jobs.pxu
index 2ae943a..c7de4a9 100644
--- a/units/wwan/jobs.pxu
+++ b/units/wwan/jobs.pxu
@@ -134,14 +134,18 @@ depends:
 
 id: wwan/gsm-connection-manual
 plugin: manual
+template-engine: jinja2
 _summary: Verify a GSM broadband modem can create a data connection
 _purpose:
  Ensure that the data connection can be made
 _steps:
  1. Open another terminal on SUT (or press ctrl+z to suspend Checkbox)
- 2. Run `sudo nmcli c add type gsm ifname <ifname> con-name GSM apn <your.carrier.com>` replacing the
-    "your.carrier.com" with appropriate APN name, and ifname with appropriate interface (interface can be found by
+ 2. Run `sudo nmcli c add type gsm ifname {{ __checkbox_env__.get("WWAN_NET_IF", "<ifname>") }} con-name GSM apn {{ __checkbox_env__.get("WWAN_APN", "<your.carrier.com>") }}`
+ {%- if "WWAN_NET_IF" not in __checkbox_env__ %}
+    Replacing the "your.carrier.com" with appropriate APN name,
+    and ifname with appropriate interface (interface can be found by
     running sudo nmcli d)
+ {%- endif %}
  3. Ping Google (Run: `ping 8.8.8.8 -c 5`)
  4. Disconnect from the network (Run: `sudo nmcli c delete GSM`)
  5. Run `fg` to jump back to checkbox (if you're running in the same terminal)