Merge lp:~fginther/ubuntu-test-cases/boottest-fix-install into lp:ubuntu-test-cases/touch

[Francis Ginther]

Install boottest binary packages during getinstalledpkgs, removing that responsibility from the boottest dep8 test.

Install boottest binary packages during getinstalledpkgs, removing that responsibility from the boottest dep8 test.

By provisioning the device before the boottest dep8 test is executed, we allow it to be swapped out with a different dep8 test (or extended with other tests etc.). Also the boottest dep8 control file would never be able to install the packages, it must be explicitly scripted somewhere.

[lp:~fginther/ubuntu-test-cases/boottest-fix-install]

401. By Francis Ginther on 2015-06-02

Remove insertion of bin_packages into the boottest control script, installation is now done earlier.

[Paul Larson (pwlars)]

I'm wondering if we can move away completely from using the getinstalledpkgs bit. Do we really need to do that with adt-run? It seems like overkill.

[lp:~fginther/ubuntu-test-cases/boottest-fix-install]

402. By Francis Ginther on 2015-06-02

Add a non-defualt dependency to the boottest dep8 control file.

[Francis Ginther (fginther)]

> I'm wondering if we can move away completely from using the getinstalledpkgs
> bit. Do we really need to do that with adt-run? It seems like overkill.

There is no strict reason to use getinstalledpkgs, but it does do a few things:
 - Adds the proposed pocket
 - Updates the apt-cache with the proposed content
 - Executes the smarts in getinstalledpkgs.template

[Paul Larson (pwlars)]

This makes sense. We could probably do something clever with xargs for the package list, but I'm not inclined to optimize this much right now. I'd much rather work towards stripping it out. +1

review: Approve

=== modified file 'scripts/boottest.sh'
--- scripts/boottest.sh	2015-06-02 18:30:38 +0000
+++ scripts/boottest.sh	2015-06-02 18:30:38 +0000
@@ -179,13 +179,6 @@
 	RET=$?
 	set -e
 else
-	FROM=${TESTS}/boottest/debian/tests/control.template
-	TARGET=${TESTS}/boottest/debian/tests/control
-
-        # Inject the binary packages built previously
-        BIN_PACKAGES=$(tr '\n' ',' < ${PKG_SRC_DIR}/artifacts/needs_install.packages | sed -e s/,$//)
-        sed -e "s/{{ bin_packages }}/${BIN_PACKAGES}/"  ${FROM} > ${TARGET}
-
 	# Now execute the boot test
 	set +e
 	${ADT_CMD} --unbuilt-tree ${TESTS}/boottest -o results ${ADT_OPTS}

=== renamed file 'tests/boottest/debian/tests/control.template' => 'tests/boottest/debian/tests/control'
--- tests/boottest/debian/tests/control.template	2015-01-28 16:24:12 +0000
+++ tests/boottest/debian/tests/control	2015-06-02 18:30:38 +0000
@@ -1,4 +1,6 @@
 Tests: boottest
-# Make adt-run install the binary packages by declaring a dep
-Depends: {{ bin_packages }}
+# Depends has to contain something, otherwise it defaults to the 'boottest'
+# binary package, which does not exist.  The package 'coreutils' is specified
+# because the test uses 'ls', which comes from 'coreutils'.
+Depends: coreutils
 Restrictions: needs-root

=== modified file 'tests/getinstalledpkgs/debian/tests/control'
--- tests/getinstalledpkgs/debian/tests/control	2015-06-02 18:30:38 +0000
+++ tests/getinstalledpkgs/debian/tests/control	2015-06-02 18:30:38 +0000
@@ -1,2 +1,3 @@
 Tests: getinstalledpkgs
 Depends: dpkg-dev, dctrl-tools
+Restrictions: needs-root

=== modified file 'tests/getinstalledpkgs/debian/tests/getinstalledpkgs.template'
--- tests/getinstalledpkgs/debian/tests/getinstalledpkgs.template	2015-06-02 18:30:38 +0000
+++ tests/getinstalledpkgs/debian/tests/getinstalledpkgs.template	2015-06-02 18:30:38 +0000
@@ -8,3 +8,12 @@
 grep-aptavail -X -n -S -sPackage {{ source_package }} | sort | uniq > binary.packages
 # Get the binary packages already installed
 comm  -1 -2 binary.packages installed.packages > needs_install.packages
+
+# Now install the set of needs_install.packages
+# This are further pinned to proposed via the apt-get '-t' option
+release=$(lsb_release -s -c)
+package_list=""
+while read package; do
+    package_list="${package_list} ${package}"
+done < needs_install.packages
+apt-get install -t ${release}-proposed $package_list 2> apt-get-install.stderr