Merge lp:~fginther/ubuntu-touch-boottest/console-log-cleanup into lp:ubuntu-touch-boottest

[Francis Ginther]

Provide END_MESSAGEs for all exit paths and redirect provisiong to it's own log file.

Provide END_MESSAGEs for all exit paths and redirect provisiong to it's own log file.

For:
- https://trello.com/c/N6cX3fxH/131-1-boottest-provide-better-failure-indication
- https://trello.com/c/SnqfJXaP/130-1-boottest-quiet-image-provisioning

[lp:~fginther/ubuntu-touch-boottest/console-log-cleanup]

7. By Francis Ginther on 2015-06-05

Cleanup tabs.

[Evan (ev)]

Minor nits, but don't block on these +1

review: Approve

[Paul Larson (pwlars)]

A couple of small items

review: Needs Fixing

[lp:~fginther/ubuntu-touch-boottest/console-log-cleanup]

8. By Francis Ginther on 2015-06-06

Apply fixes from review comments.

[Francis Ginther (fginther)]

Thanks for the good comments. Rev 8 tested here:

http://d-jenkins.ubuntu-ci:8080/view/Wily/view/BootTest/job/fjg-boottest/52/console

[Paul Larson (pwlars)]

Looks good, +1

review: Approve

=== modified file 'boottest.sh'
--- boottest.sh	2015-06-05 20:15:05 +0000
+++ boottest.sh	2015-06-06 02:56:04 +0000
@@ -23,10 +23,8 @@
 
 # Setup our dependencies
 UTILDIR="${BASEDIR}/utils"
-if [ -f "${UTILDIR}" ]; then
-    rm -rf "${UTILDIR}"
-fi
-bzr branch lp:ubuntu-test-cases/touch $UTILDIR
+rm -rf "${UTILDIR}"
+bzr checkout --lightweight lp:ubuntu-test-cases/touch $UTILDIR
 
 # Default adt-run timeout
 export ADT_TIMEOUT=${ADT_TIMEOUT:-600}
@@ -68,7 +66,6 @@
     [ -z ${NODE_NAME} ] || ${UTILDIR}/scripts/recover.py ${NODE_NAME}
 
     # Leave a parting message
-    # (disable command tracing as it confuses the output)
     [ -z "${END_MESSAGE}" ] || echo -e "\n\n${END_MESSAGE}\n\n"
 }
 trap exit_handler SIGINT SIGTERM EXIT
@@ -123,7 +120,7 @@
 if [ -n "${NODE_NAME}" ]; then
     while [ ${RETRY} -gt 0 ]; do
         echo "Provisioning device"
-        ${PROV_CMD} && break
+        ${PROV_CMD} > "provision.log" 2>&1 && break
         PROV_ERR=$?
         # Make sure the device doesn't need to be recovered first
         ${UTILDIR}/scripts/recover.py ${NODE_NAME}
@@ -138,7 +135,7 @@
         echo "Provisioning failed, retrying up to ${RETRY} more times..."
     done
     if [ ${RETRY} -eq 0 ]; then
-        echo ERROR: Device provisioning failed!
+        END_MESSAGE="ERROR: Device provisioning failed!"
         exit 1
     fi
 fi
@@ -215,7 +212,7 @@
     adb pull /home/phablet/sourcepkg-version results/sourcepkg-version
     echo "Version tested: $(cat results/sourcepkg-version)"
     grep -q 'ERROR' results/sourcepkg-version && \
-	    END_MESSAGE="$(cat results/sourcepkg-version)"
+        END_MESSAGE="$(cat results/sourcepkg-version)"
     set -e
 fi
 
@@ -226,12 +223,17 @@
 
 if [ -e "results/sourcepkg-version" -a -e "results/testbed-packages" ]; then
     result='PASS'
+    END_MESSAGE="PASS: Boottest passed"
     resultfile=results/${RELEASE}_${ARCH}_${SRC_PKG_NAME}_$(date +%Y%m%d-%H%M%S).result
-    [ $RET -gt 0 ] && result="FAIL"
+    if [ $RET -gt 0 ]; then
+        result="FAIL"
+        END_MESSAGE="FAIL: Boottest failure"
+    fi
     echo "$RELEASE $ARCH ${SRC_PKG_NAME} $(cat results/sourcepkg-version) $result $(sort -u results/*-packages|tr -s '[\n\t]' ' ')" > $resultfile
     [ -f "$resultfile" ] && ${RSYNC} -a $resultfile $RSYNC_DEST/${RELEASE}/tmp/ || true
 else
     # Something went wrong with the testbed
+    END_MESSAGE="ERROR: Boottest testbed failure"
     errfile=results/${RELEASE}_${ARCH}_${SRC_PKG_NAME}_$(date +%Y%m%d-%H%M%S).error
     echo "$RELEASE $ARCH $SRC_PKG_NAME" > $errfile
     [ -f "$errfile" ] && ${RSYNC} -a $errfile $RSYNC_DEST/${RELEASE}/tmp/ || true