Merge lp:~fginther/ubuntu-test-cases/mp-testing-wifi into lp:~ubuntu-test-case-dev/ubuntu-test-cases/mp-testing

[Francis Ginther]

Cherry pick of location change for wifi-config based on the deployment change: lp:~pwlars/charms/trusty/jenkins-remote-slave/wifi-conf-location-change.

Cherry pick of location change for wifi-config based on the deployment change: lp:~pwlars/charms/trusty/jenkins-remote-slave/wifi-conf-location-change.

Tested here:
http://s-jenkins.ubuntu-ci:8080/job/generic-deb-autopilot-runner-mako/5754

[Paul Larson (pwlars)]

Seems to be working ok in smoke testing, so +1

review: Approve

Unmerged revisions

230. By Francis Ginther on 2014-10-22

Cherry pick of location change for wifi-config based on the deployment change: lp:~pwlars/charms/trusty/jenkins-remote-slave/wifi-conf-location-change.

=== modified file 'scripts/provision.sh'
--- scripts/provision.sh	2014-09-12 21:52:55 +0000
+++ scripts/provision.sh	2014-10-22 13:31:32 +0000
@@ -9,7 +9,7 @@
 
 RESDIR=`pwd`/clientlogs
 
-NETWORK_FILE="${NETWORK_FILE-/home/ubuntu/magners-wifi}"
+NETWORK_FILE="${NETWORK_FILE-${HOME}/.ubuntu-ci/wifi.conf}"
 
 IMAGE_OPT="${IMAGE_OPT---bootstrap --channel utopic-proposed}"
 UUID="${UUID-$(uuidgen -r)}"