Merge lp:~cjohnston/ubuntu-test-cases/add-sys-img-suppport into lp:ubuntu-test-cases/smoke-touch-apps

[Chris Johnston]

Add the ability to provision using the system images.

[Andy Doan (doanac)]

14 -flock /tmp/phablet-flash-lock phablet-flash -D -s $ANDROID_SERIAL --pending
15 +flock /tmp/phablet-flash-lock phablet-flash -D -s $ANDROID_SERIAL ${TOUCH_IMAGE}

wanna go ahead and remove the "flock" call as well since this is now supported in phablet-tools?

review: Approve

[Paul Larson (pwlars)]

Agree with Andy, we can remove all the flock stuff and now would be a good time to do it. It looks like someone already updated phablet-tools on phoenix, so we should be all set now. Otherwise, +1 from me

review: Approve

[lp:~cjohnston/ubuntu-test-cases/add-sys-img-suppport]

60. By Chris Johnston on 2013-08-07

Remove flocking

[Chris Johnston (cjohnston)]

Eagles don't flock, you have to find them one at a time.

review: Needs Resubmitting

[Paul Larson (pwlars)]

Looks good

review: Approve

=== modified file 'jenkins/provision.sh'
--- jenkins/provision.sh	2013-08-02 20:07:28 +0000
+++ jenkins/provision.sh	2013-08-07 13:17:25 +0000
@@ -15,9 +15,13 @@
 ANDROID_SERIAL="${ANDROID_SERIAL-015d1884b20c1c0f}"  #doanac's nexus7 at home
 NETWORK_FILE="${NETWORK_FILE-/home/ubuntu/magners-wifi}"
 
+# Image to use for flashing
+# Syntax: TOUCH_IMAGE=--ubuntu-bootstrap
+TOUCH_IMAGE="${TOUCH_IMAGE---pending}"
+
 rm -rf clientlogs
 mkdir clientlogs
 
-flock /tmp/phablet-flash-lock phablet-flash -D -s $ANDROID_SERIAL --pending
+phablet-flash -D -s $ANDROID_SERIAL ${TOUCH_IMAGE}
 
-${UTAH_PHABLET_CMD} -s ${ANDROID_SERIAL} --results-dir ${RESDIR} --network-file=${NETWORK_FILE}
+${UTAH_PHABLET_CMD} -s ${ANDROID_SERIAL} --results-dir ${RESDIR} --network-file=${NETWORK_FILE} ${TOUCH_IMAGE}