Merge lp:~fginther/ubuntu-test-cases/boottest-standalone into lp:~canonical-ci-engineering/ubuntu-test-cases/bootttest

[Francis Ginther]

Modify paths and bzr branch lp:ubuntu-test-cases/touch as a dependency.

Modify paths and bzr branch lp:ubuntu-test-cases/touch as a dependency.

The result of this is a working version of boottest that is separated from lp:ubuntu-test-cases/touch. It does use lp:ubuntu-test-cases/touch as a dependency, grabbing a fresh copy on each run.

[Paul Larson (pwlars)]

Found one potential issue, otherwise looks pretty good. I do think this is a sane idea, and moves us more towards the model we are shooting for. In the future, this really should be a standalone piece that anyone could own.

review: Needs Fixing

[Francis Ginther (fginther)]

My intention is that this branch contain everything specifically related to boottesting. This includes:

 - boottest.sh
 - adt-run.py (specifically used by boottest.sh to execute adt-run)
 - tests/boottest - The dep8 test used to execute the actual test
 - tests/bootfail - Another dep8 test used to test an actual boot failure

If you think boottest.sh and adt-run belong under a scripts dir, I'm fine with that.

[Paul Larson (pwlars)]

Ok, I missed that you moved it already. In that case, there's certainly no path problem there. Looks good, we'll just have to change the branch we pull from in auto-package-testing jenkins template I guess. I have another change in progress that will affect that for the description setter if we want to roll them together.

review: Approve

[Francis Ginther (fginther)]

This is now relocated to lp:ubuntu-touch-boottest.

=== modified file 'boottest.sh'
--- boottest.sh	2015-06-04 18:46:39 +0000
+++ boottest.sh	2015-06-04 21:08:28 +0000
@@ -2,7 +2,7 @@
 set -e
 
 # Where am I ?
-BASEDIR=$(dirname $(readlink -f $0))/..
+BASEDIR=$(dirname $(readlink -f $0))
 
 # Provide a message to report special information
 END_MESSAGE=""
@@ -21,6 +21,13 @@
     source $BOOTTESTRC
 fi
 
+# Setup our dependencies
+UTILDIR="${BASEDIR}/utils"
+if [ -f "${UTILDIR}" ]; then
+    rm -rf "${UTILDIR}"
+fi
+bzr branch lp:ubuntu-test-cases/touch $UTILDIR
+
 # Default adt-run timeout
 export ADT_TIMEOUT=${ADT_TIMEOUT:-600}
 
@@ -58,7 +65,7 @@
     fi
 
     # Ensure we leave a usable phone
-    [ -z ${NODE_NAME} ] || ${BASEDIR}/scripts/recover.py ${NODE_NAME}
+    [ -z ${NODE_NAME} ] || ${UTILDIR}/scripts/recover.py ${NODE_NAME}
 
     # Leave a parting message
     # (disable command tracing as it confuses the output)
@@ -73,7 +80,7 @@
 # These can be set by jenkins when running in that context
 
 # ANDROID_SERIAL: The phone ID.
-[ -z ${NODE_NAME} ] || export ANDROID_SERIAL=${ANDROID_SERIAL:-$(${BASEDIR}/scripts/get-adb-id ${NODE_NAME})}
+[ -z ${NODE_NAME} ] || export ANDROID_SERIAL=${ANDROID_SERIAL:-$(${UTILDIR}/scripts/get-adb-id ${NODE_NAME})}
 
 # FIXME: Should be provided -- vila 2015-01-26
 ARCH="${ARCH:-krillin}"
@@ -87,14 +94,14 @@
 export SKIP_TESTCONFIG=1
 
 # Ensures we start with a usable phone
-[ -z ${NODE_NAME} ] || ${BASEDIR}/scripts/recover.py ${NODE_NAME}
+[ -z ${NODE_NAME} ] || ${UTILDIR}/scripts/recover.py ${NODE_NAME}
 
 TESTS=${BASEDIR}/tests
 
 # Provision the device
 # Allow the image revision to be overridden if the latest is unusable
 REVISION="${REVISION:-0}"
-PROV_CMD="${BASEDIR}/scripts/provision.sh \
+PROV_CMD="${UTILDIR}/scripts/provision.sh \
     -r $REVISION \
     -n ${HOME}/.ubuntu-ci/wifi.conf -w"
 RETRY=3
@@ -104,7 +111,7 @@
         ${PROV_CMD} && break
         PROV_ERR=$?
         # Make sure the device doesn't need to be recovered first
-        ${BASEDIR}/scripts/recover.py ${NODE_NAME}
+        ${UTILDIR}/scripts/recover.py ${NODE_NAME}
         if [ ${PROV_ERR} -eq 124 ]; then
             # The provisioning fails with a timeout, the image is not
             # flashable/bootable
@@ -179,7 +186,7 @@
     # Now execute the boot test
     set +e
     echo "Running boottest test suite."
-    ${BASEDIR}/scripts/run-adt.py ${ADT_CMD} --unbuilt-tree ${TESTS}/boottest -o results ${ADT_OPTS}
+    ${BASEDIR}/run-adt.py ${ADT_CMD} --unbuilt-tree ${TESTS}/boottest -o results ${ADT_OPTS}
     RET=$?
     # Fetch the sourcepkg-version file that contains the version data
     # for the package under test. We can't use the testpkg-version file