Merge lp:~fginther/ubuntu-touch-boottest/add-vivid-support into lp:ubuntu-touch-boottest

[Francis Ginther]

Add support for a specific image per release and fail the test if the source package produces no needs-install binaries.

Add support for a specific image per release and fail the test if the source package produces no needs-install binaries.

Foundations (sil2100) has confirmed that these are the right images to use. Also checking to make sure the binaries installed on these images match the manifest which britney would use (see: https://code.launchpad.net/~fginther/britney/add-vivid-manifest/+merge/261212). The debian packages from the manifest files match those installed on these images.

This been tested:
* wily gtk+3.0 (valid wily package) - http://d-jenkins.ubuntu-ci:8080/view/Wily/view/BootTest/job/fjg-boottest/43/
* vivid gcc-5 (NOT a valid vivid package) - http://d-jenkins.ubuntu-ci:8080/view/Wily/view/BootTest/job/fjg-boottest/45/
* vivid gcc-4.9 (valid vivid package) - http://d-jenkins.ubuntu-ci:8080/view/Wily/view/BootTest/job/fjg-boottest/46/
* wily gcc-4.9 (NOT a valid wily package) http://d-jenkins.ubuntu-ci:8080/view/Wily/view/BootTest/job/fjg-boottest/47/

[Paul Larson (pwlars)]

I think we should make a slight change to this for when the package has no binaries, but do you have an example of a case where that actually happens? It seems like if that were the case?

review: Needs Information

[Para Siva (psivaa)]

+1, looks good, especially with the results.

review: Approve

[lp:~fginther/ubuntu-touch-boottest/add-vivid-support]

5. By Francis Ginther on 2015-06-05

Add an END_MESSAGE if there is no image for this release or no installable binaries for this source package.

[Francis Ginther (fginther)]

Added "ERROR: No packages to install!" to the END_MESSAGE.

review: Needs Resubmitting

[Francis Ginther (fginther)]

New test run here: http://d-jenkins.ubuntu-ci:8080/view/Wily/view/BootTest/job/fjg-boottest/48/console

[Paul Larson (pwlars)]

+1

review: Approve

=== modified file 'boottest.sh'
--- boottest.sh	2015-06-04 22:04:37 +0000
+++ boottest.sh	2015-06-05 20:15:23 +0000
@@ -99,8 +99,23 @@
 TESTS=${BASEDIR}/tests
 
 # Provision the device
-# Allow the image revision to be overridden if the latest is unusable
-REVISION="${REVISION:-0}"
+# Select the appropriate image per release
+# REVISION allows the image revision to be overridden if the latest is
+# unusable. '0' indicates latest.
+if [ "${RELEASE}" == 'vivid' ]; then
+    CHANNEL="ubuntu-touch/rc-proposed/bq-aquaris.en"
+    REVISION="${VIVID_REVISION:-0}"
+elif [ "${RELEASE}" == 'wily' ]; then
+    CHANNEL="ubuntu-touch/devel-proposed/krillin.en"
+    REVISION="${WILY_REVISION:-0}"
+else
+    END_MESSAGE="ERROR: Unsupported release: ${RELEASE}"
+    exit 1
+fi
+
+# IMAGE_OPT is consumed by provision.sh and is currently the only way
+# to specify a channel other then the default
+export IMAGE_OPT="--bootstrap --developer-mode --channel $CHANNEL"
 PROV_CMD="${UTILDIR}/scripts/provision.sh \
     -r $REVISION \
     -n ${HOME}/.ubuntu-ci/wifi.conf -w"
@@ -143,6 +158,11 @@
 SANITIZED_SRC_PKG_NAME=${SRC_PKG_NAME/+/\\+}
 echo "grep-aptavail -e -n -S -sPackage \"^${SANITIZED_SRC_PKG_NAME}( \\(.*\\))?\$\"| sort | uniq > binary.packages" >> adt-commands
 echo "comm  -1 -2 binary.packages installed.packages > needs_install.packages" >> adt-commands
+# If the list of needs_install.packages is empty, then we're trying to test
+# a source package that installs no binaries to this image. Set an appropriate
+# message which will be picked up after the boottest attempt and exit (which
+# will cause adt-run to exit with error code 20).
+echo '[ $(wc -l needs_install.packages | cut -f 1 -d " ") -eq "0" ] && (echo "ERROR: No packages to install!" > /home/phablet/sourcepkg-version && exit 1)' >> adt-commands
 echo 'release=$(lsb_release -s -c)' >> adt-commands
 # Include '-y' in the list of apt-get options because the updated package
 # under test could pull in new dependencies.
@@ -194,6 +214,8 @@
     # fake boottest package, not the package we're actually testing.
     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)"
     set -e
 fi