Merge ~jhodapp/snappy-hwe-snaps/+git/build-scripts:run-tests into ~snappy-hwe-team/snappy-hwe-snaps/+git/build-scripts:master

[Jim Hodapp]

Run the run-tests.sh script in a chroot which allows any type of tests to be run and not just spread tests (e.g. upstream project unit tests).

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Continuous integration, rev:d13a6e25fe8fd60f4dbd717962c103ec7134e667
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/905/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/605
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/813/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/905/rebuild

review: Approve (continuous-integration)

[Simon Fels (morphis)]

review: Needs Fixing

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Continuous integration, rev:c974dee035b2bd559fb9d0c902bb9999e7233708
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/943/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/628
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/851/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/943/rebuild

review: Approve (continuous-integration)

[Simon Fels (morphis)]

LGTM

review: Approve

diff --git a/jobs/generic-run-snap-spread-tests b/jobs/generic-run-snap-spread-tests
index ce3d49b..7bb6eff 100644
--- a/jobs/generic-run-snap-spread-tests
+++ b/jobs/generic-run-snap-spread-tests
@@ -36,6 +36,7 @@ fi
 
 $SSH mkdir -p $REMOTE_WORKSPACE/bin
 
+# --- Spread build ---
 cat << EOF > $WORKSPACE/build-spread.sh
 #!/bin/bash
 set -x
@@ -83,7 +84,8 @@ ensure_package_is_installed() {
 ensure_package_is_installed kpartx
 ensure_package_is_installed qemu-kvm
 
-cat << EOF > $WORKSPACE/run-spread-tests.sh
+# --- Run tests ---
+cat << EOF > $WORKSPACE/run-tests.sh
 #!/bin/bash
 set -x
 set -e
@@ -92,12 +94,11 @@ export TERM=linux
 export DEBIAN_FRONTEND=noninteractive
 export PATH=$REMOTE_WORKSPACE/bin:$PATH
 
+[ ! -e $REMOTE_WORKSPACE ]; mkdir -p $REMOTE_WORKSPACE
+mv src_branch.tar $REMOTE_WORKSPACE
 cd $REMOTE_WORKSPACE
 
-if [ -e "src_branch" ] ; then
-    rm -rf src_branch
-fi
-git clone -b $SOURCE_GIT_REPO_BRANCH $SOURCE_GIT_REPO src_branch
+tar xf src_branch.tar
 cd src_branch
 # We require either a run-tests.sh interface script for the spread tests
 # or the basic spread.yaml spread test definition file, otherwise we fail
@@ -106,6 +107,7 @@ if [ ! -e "run-tests.sh" ] && [ ! -e "spread.yaml" ]; then
     echo "ERROR: missing spread test: you must provide a spread test"
     exit 1
 fi
+
 if [ -e "run-tests.sh" ] ; then
     if [ ! -z "$CHANNEL" ] ; then
         ./run-tests.sh --channel=$CHANNEL --test-from-channel --debug --force-new-image
@@ -122,8 +124,45 @@ fi
 rm -rf src_branch
 EOF
 
-$SCP $WORKSPACE/run-spread-tests.sh $REMOTE_USER@$REMOTE_WORKER:$REMOTE_WORKSPACE/
-$SSH chmod u+x $REMOTE_WORKSPACE/run-spread-tests.sh
-$SSH sudo systemd-run --scope $REMOTE_WORKSPACE/run-spread-tests.sh
+$SSH sudo apt install -y --force-yes debootstrap
+BUILD_ROOTFS_TARBALL=$REMOTE_WORKSPACE/snap-build-$SERIES.tar
+
+# --- Build a rootfs for test running in a chroot ---
+cat << EOF > $WORKSPACE/build-rootfs.sh
+# Get build-scripts:
+cd $REMOTE_WORKSPACE
+
+tar xf $REMOTE_WORKSPACE/build-scripts.tar -C $REMOTE_WORKSPACE
+
+sudo $REMOTE_WORKSPACE/build-scripts/scripts/build-rootfs-create $SERIES $BUILD_ROOTFS_TARBALL
+EOF
+
+tar cf $WORKSPACE/build-scripts.tar $WORKSPACE/build-scripts
+$SCP $WORKSPACE/build-scripts.tar $REMOTE_USER@$REMOTE_WORKER:$REMOTE_WORKSPACE/
+
+# No need to build the rootfs every time, but offer an option to do so
+if [ ! -e $WORKSPACE/snap-build-$SERIES.tar] || [ "$REBUILD_ROOTFS" -eq "1" ]; then
+  # Build rootfs
+  chmod u+x WORKSPACE/build-rootfs.sh
+  $WORKSPACE/build-rootfs.sh
+fi
+
+$SCP $WORKSPACE/snap-build-$SERIES.tar $REMOTE_USER@$REMOTE_WORKER:$REMOTE_WORKSPACE/
+
+# Copy the rootfs and test-running script in place that can be used within the chroot
+$SSH sudo tar xf $BUILD_ROOTFS_TARBALL -C $REMOTE_WORKSPACE
+$SSH sudo chown -R ubuntu:ubuntu $REMOTE_WORKSPACE/rootfs
+$SCP $WORKSPACE/run-tests.sh $REMOTE_USER@$REMOTE_WORKER:$REMOTE_WORKSPACE/rootfs
+$SSH chmod u+x $REMOTE_WORKSPACE/rootfs/run-tests.sh
+
+# Copy the test source branch in place that can be used within the chroot
+if [ -e "src_branch" ] ; then
+    rm -rf src_branch
+fi
+git clone -b $SOURCE_GIT_REPO_BRANCH $SOURCE_GIT_REPO src_branch
+tar cf src_branch.tar src_branch
+$SCP $WORKSPACE/src_branch.tar $REMOTE_USER@$REMOTE_WORKER:$REMOTE_WORKSPACE/rootfs
+
+$SSH sudo chroot $REMOTE_WORKSPACE/rootfs /run-tests.sh
 
 $SSH sudo rm -rf $REMOTE_WORKSPACE