Merge lp:~asac/phablet-tools/improve-network-bringup-console-output into lp:phablet-tools

Proposed by Alexander Sack on 2013-07-22
Status: Rejected
Rejected by: Sergio Schvezov on 2014-06-16
Proposed branch: lp:~asac/phablet-tools/improve-network-bringup-console-output
Merge into: lp:phablet-tools
Prerequisite: lp:~asac/phablet-tools/check-device-and-ip-state-after-sleep
Diff against target: 43 lines (+9/-5)
1 file modified
phablet-network-setup (+9/-5)
To merge this branch: bzr merge lp:~asac/phablet-tools/improve-network-bringup-console-output
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration 2013-07-22 Needs Fixing on 2013-07-22
Sergio Schvezov 2013-07-22 Pending
Review via email: mp+176144@code.launchpad.net

This proposal supersedes a proposal from 2013-07-15.

Description of the change

Code to improve what we echo on console in network bringup code; this will also help to better parse jenkins output in the utah lab...

using my other merge for: lp:~asac/phablet-tools/check-device-ip-state-after-sleep as a base:
 + https://code.launchpad.net/~asac/phablet-tools/check-device-ip-state-after-sleep/+merge/174879

Note: inspirational code landing as I have no way to test here; feel free to redo if this fails to run etc...

To post a comment you must log in.
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:130
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~asac/phablet-tools/improve-network-bringup-console-output/+merge/176144/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/119/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-saucy-amd64-ci/62
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-saucy-armhf-ci/62
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-saucy-i386-ci/62

Click here to trigger a rebuild:
http://s-jenkins:8080/job/phablet-tools-ci/119/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

130. By Alexander Sack on 2013-07-15

improve debugging output of network device and IP bringup code in phablet-network-setup

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'phablet-network-setup'
2--- phablet-network-setup 2013-07-22 08:47:27 +0000
3+++ phablet-network-setup 2013-07-22 08:47:27 +0000
4@@ -145,30 +145,34 @@
5 apt-get install --yes --quiet openssh-server iw
6 EOF
7
8- echo Installing ssh
9+ echo Bringing up Network device...
10 nmcli_cmd="adb $ADBOPTS shell $CHROOTCMD $CHROOTDIR/usr/bin/nmcli"
11 wait=0
12 iface=$($nmcli_cmd -t -f devices con status | tr -d '\r')
13 until [ -n "$iface" ] || [ $wait -eq 10 ]; do
14- echo "Network not ready, sleeping"
15+ echo "Network device ready yet:"
16+ $nmcli_cmd c list
17 sleep $(( wait++ ))
18 iface=$($nmcli_cmd -t -f devices con status | tr -d '\r')
19 done
20 if [ -z "$iface" ]; then
21- echo "Network setup timed out"
22+ echo "Network device setup timed out. Bailing out!"
23 exit 1
24 fi
25 wait=0
26+ echo Bringing up Network IP for \"$iface\" ...
27 ip_data=$($nmcli_cmd -t dev list iface $iface | grep ADDRESS)
28 until [ -n "$ip_data" ] || [ $wait -eq 10 ]; do
29- echo "Network not ready, sleeping"
30+ echo "Network device \"$iface\" has no IP yet:"
31 sleep $(( wait++ ))
32 ip_data=$($nmcli_cmd -t dev list iface $iface | grep ADDRESS)
33 done
34 if [ -z "$ip_data" ]; then
35- echo "Network setup timed out"
36+ echo "Network IP setup \"$iface\" timed out. Bailing out!"
37 exit 1
38 fi
39+
40+ echo Installing ssh
41 adb $ADBOPTS push $TMP_FILE $CHROOTDIR/$TMP_FILE
42 adb $ADBOPTS shell chmod 755 $CHROOTDIR/$TMP_FILE
43 adb $ADBOPTS shell $CHROOTCMD $CHROOTDIR/$TMP_FILE

Subscribers

People subscribed via source and target branches