Merge ~morphis/snappy-hwe-snaps/+git/jenkins-jobs:f/docker-for-spread-testing into ~snappy-hwe-team/snappy-hwe-snaps/+git/jenkins-jobs:master

[Simon Fels]

Import spread testing docker container and use it inside the snap-test job

[Konrad Zapałowicz (kzapalowicz)]

ack

review: Approve (code)

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

PASSED: Continuous integration, rev:1d0c6117057d82e064e2f3de605f63782058aa85
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/487/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-worker/537
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/538
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-test/536
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/504/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/487/rebuild

review: Approve (continuous-integration)

diff --git a/README.md b/README.md
index 2d3f654..8bf1232 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ components.
 Build the docker container which comes with this repository:
 
 ```
-$ cd docker
+$ cd docker/development
 $ sudo docker build -t se-jenkins .
 ```
 
diff --git a/docker/Dockerfile b/docker/development/Dockerfile
index a898d1e..a898d1e 100644
--- a/docker/Dockerfile
+++ b/docker/development/Dockerfile
diff --git a/docker/initial-setup.groovy b/docker/development/initial-setup.groovy
index 5a9598d..5a9598d 100644
--- a/docker/initial-setup.groovy
+++ b/docker/development/initial-setup.groovy
diff --git a/docker/jenkins.sh b/docker/development/jenkins.sh
index 5d095be..5d095be 100644
--- a/docker/jenkins.sh
+++ b/docker/development/jenkins.sh
diff --git a/docker/plugins.sh b/docker/development/plugins.sh
index ec8e8e5..ec8e8e5 100755
--- a/docker/plugins.sh
+++ b/docker/development/plugins.sh
diff --git a/docker/plugins.txt b/docker/development/plugins.txt
index 5020d33..5020d33 100644
--- a/docker/plugins.txt
+++ b/docker/development/plugins.txt
diff --git a/docker/spread-tests/Dockerfile b/docker/spread-tests/Dockerfile
new file mode 100644
index 0000000..4319265
--- /dev/null
+++ b/docker/spread-tests/Dockerfile
@@ -0,0 +1,4 @@
+FROM ubuntu:16.04
+
+RUN apt-get update && apt-get install -y \
+    kpartx qemu-kvm ubuntu-image snapd golang-go git sudo
diff --git a/jobs/snap/snap-build-worker.sh b/jobs/snap/snap-build-worker.sh
index 1c32dec..062e401 100644
--- a/jobs/snap/snap-build-worker.sh
+++ b/jobs/snap/snap-build-worker.sh
@@ -134,7 +134,6 @@ SSH_KEY_PATH="${SSH_PATH}/git.launchpad.net/$BOT_USERNAME"
 SSH="ssh -i $SSH_KEY_PATH/id_rsa $REMOTE_USER@$REMOTE_WORKER"
 SCP="scp -i $SSH_KEY_PATH/id_rsa"
 
-RESULTS_ID=$(md5sum $(find $WORKSPACE/results/*.snap | tail -n1) | cut -d' ' -f 1)
 REMOTE_RESULTS_BASE_DIR=/home/$REMOTE_USER/results
 
 $SSH mkdir -p $REMOTE_RESULTS_BASE_DIR/$RESULTS_ID
diff --git a/jobs/snap/snap-test.sh b/jobs/snap/snap-test.sh
index d673610..8e7bdd8 100644
--- a/jobs/snap/snap-test.sh
+++ b/jobs/snap/snap-test.sh
@@ -108,7 +108,7 @@ $SCP $WORKSPACE/run-tests.sh $REMOTE_USER@$REMOTE_WORKER:$REMOTE_WORKSPACE
 $SSH chmod u+x $REMOTE_WORKSPACE/run-tests.sh
 
 $SSH mkdir -p $REMOTE_WORKSPACE/docker
-$SCP $WORKSPACE/build-scripts/docker/spread-tests/Dockerfile \
+$SCP $BUILD_SCRIPTS/docker/spread-tests/Dockerfile \
     $REMOTE_USER@$REMOTE_WORKER:$REMOTE_WORKSPACE/docker
 $SSH time sudo docker build -t snap-spread-tests $REMOTE_WORKSPACE/docker