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

[Alexander Sack]

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

[PS Jenkins bot (ps-jenkins)]

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

=== modified file 'phablet-network-setup'
--- phablet-network-setup	2013-07-22 08:47:27 +0000
+++ phablet-network-setup	2013-07-22 08:47:27 +0000
@@ -145,30 +145,34 @@
 apt-get install --yes --quiet openssh-server iw
 EOF
 
-    echo Installing ssh
+    echo Bringing up Network device...
     nmcli_cmd="adb $ADBOPTS shell $CHROOTCMD $CHROOTDIR/usr/bin/nmcli"
     wait=0
     iface=$($nmcli_cmd -t -f devices con status | tr -d '\r')
     until [ -n "$iface" ] || [ $wait -eq 10 ]; do
-        echo "Network not ready, sleeping"
+        echo "Network device ready yet:"
+	$nmcli_cmd c list
         sleep $(( wait++ ))
         iface=$($nmcli_cmd -t -f devices con status | tr -d '\r')
     done
     if [ -z "$iface" ]; then
-        echo "Network setup timed out"
+        echo "Network device setup timed out. Bailing out!"
         exit 1
     fi
     wait=0
+    echo Bringing up Network IP for \"$iface\" ...
     ip_data=$($nmcli_cmd -t dev list iface $iface | grep ADDRESS)
     until [ -n "$ip_data" ] || [ $wait -eq 10 ]; do
-        echo "Network not ready, sleeping"
+        echo "Network device \"$iface\" has no IP yet:"
         sleep $(( wait++ ))
         ip_data=$($nmcli_cmd -t dev list iface $iface | grep ADDRESS)
     done
     if [ -z "$ip_data" ]; then
-        echo "Network setup timed out"
+        echo "Network IP setup \"$iface\" timed out. Bailing out!"
         exit 1
     fi
+
+    echo Installing ssh
     adb $ADBOPTS push $TMP_FILE $CHROOTDIR/$TMP_FILE
     adb $ADBOPTS shell chmod 755 $CHROOTDIR/$TMP_FILE
     adb $ADBOPTS shell $CHROOTCMD $CHROOTDIR/$TMP_FILE