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

Proposed by Francis Ginther
Status: Needs review
Proposed branch: lp:~fginther/ubuntu-test-cases/mp-testing-wifi
Merge into: lp:~ubuntu-test-case-dev/ubuntu-test-cases/mp-testing
Diff against target: 12 lines (+1/-1)
1 file modified
scripts/provision.sh (+1/-1)
To merge this branch: bzr merge lp:~fginther/ubuntu-test-cases/mp-testing-wifi
Reviewer Review Type Date Requested Status
Paul Larson Approve
Review via email: mp+239189@code.launchpad.net

Commit message

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

Description of the change

To post a comment you must log in.
Revision history for this message
Paul Larson (pwlars) wrote :

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

review: Approve

Unmerged revisions

230. By 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.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'scripts/provision.sh'
2--- scripts/provision.sh 2014-09-12 21:52:55 +0000
3+++ scripts/provision.sh 2014-10-22 13:31:32 +0000
4@@ -9,7 +9,7 @@
5
6 RESDIR=`pwd`/clientlogs
7
8-NETWORK_FILE="${NETWORK_FILE-/home/ubuntu/magners-wifi}"
9+NETWORK_FILE="${NETWORK_FILE-${HOME}/.ubuntu-ci/wifi.conf}"
10
11 IMAGE_OPT="${IMAGE_OPT---bootstrap --channel utopic-proposed}"
12 UUID="${UUID-$(uuidgen -r)}"

Subscribers

People subscribed via source and target branches