Merge lp:~vila/ubuntu-test-cases/copy-only-debian into lp:ubuntu-test-cases/touch

[Vincent Ladeuil]

As explained in https://trello.com/c/UVP24JdU/77-boottest-copying-source-package-to-the-phone-can-fail , we're exhausting space on the phone.

To avoid the issue, this proposals copy the debian directory only which is all we care about to be able to inject the boot DEP8 test.

https://trello.com/c/UVP24JdU/77-boottest-copying-source-package-to-the-phone-can-fail
Instead of copying the whole package source tree to the phone (which can fail), copy only the debian directory which is the only part we care about.

A successful run with this proposal is at: http://d-jenkins.ubuntu-ci:8080/view/Vivid/view/BootTest/job/fjg-boottest/9/console

[Para Siva (psivaa)]

+1, sorry for the late response.

review: Approve

=== modified file 'scripts/boottest.sh'
--- scripts/boottest.sh	2015-02-13 17:00:02 +0000
+++ scripts/boottest.sh	2015-02-17 13:41:48 +0000
@@ -101,6 +101,7 @@
 
 # --no-built-binaries should come first
 # --debug helps while debugging, can be removed otherwise
+# 'timeout' returns 124 if ${ADT_TIMEOUT} is reached.
 ADT_CMD="timeout ${ADT_TIMEOUT} adt-run --debug --no-built-binaries"
 # ADT_VIRT can be overridden for local tests, 
 # it defaults to ${ANDROID_SERIAL} phone via the adb/ssh combo
@@ -145,10 +146,17 @@
 	RET=$?
 	set -e
 else
-	# Inject the boot DEP8 test into the package source tree
 	SOURCE_DIR=$(ls -d ${PKG_SRC_DIR}/artifacts/${SRC_PKG_NAME}-*)
+        # Get the debian dir from the source package (involving the whole
+        # source tree can fail with 'No space left on device' on the phone).
+        TARGET_BASE=work
+        rm -fr ${TARGET_BASE}
+        mkdir -p ${TARGET_BASE}
+        cp -rd ${SOURCE_DIR}/debian ${TARGET_BASE}
+	# Inject the boot DEP8 test into the debian dir from the package
+	# source tree
 	FROM=${TESTS}/boottest/debian/tests
-	TARGET="${SOURCE_DIR}/debian/tests"
+	TARGET="${TARGET_BASE}/debian/tests"
 	mkdir -p ${TARGET} # For packages that don't define DEP8 tests
         # Inject the binary packages built previously
         BIN_PACKAGES=$(tr '\n' ',' < ${PKG_SRC_DIR}/artifacts/needs_install.packages | sed -e s/,$//)
@@ -156,9 +164,9 @@
             ${FROM}/control.template > ${TARGET}/control
 	cp ${FROM}/boottest ${TARGET}
 
-	# Now execute the boot test from inside the pkg source tree
+	# Now execute the boot test from inside the (reduced) pkg source tree
 	set +e
-	${ADT_CMD} --unbuilt-tree ${SOURCE_DIR} -o results ${ADT_OPTS}
+	${ADT_CMD} --unbuilt-tree ${TARGET_BASE} -o results ${ADT_OPTS}
 	RET=$?
 	set -e
 fi