Merge ~alfonsosanchezbeato/snappy-hwe-snaps/+git/jenkins-jobs:use-pre-built-spread into ~snappy-hwe-team/snappy-hwe-snaps/+git/jenkins-jobs:master

[Alfonso Sanchez-Beato]

Use pre-built spread

Use a pre-built spread, as it is impossible to build it on xenial due
to golang libs becoming incompatible with 1.6

[Konrad Zapałowicz (kzapalowicz)]

review: Approve

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

PASSED: Continuous integration, rev:a1071f74f15693b6e4ac4f7b6d788057f8866f82
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/274/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/317
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/317
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/317
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/317
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1107
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/850
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/885/console

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

review: Approve (continuous-integration)

diff --git a/jobs/snap/snap-test.sh b/jobs/snap/snap-test.sh
index 4982445..10cb331 100644
--- a/jobs/snap/snap-test.sh
+++ b/jobs/snap/snap-test.sh
@@ -73,26 +73,11 @@ export TERM=linux
 export DEBIAN_FRONTEND=noninteractive
 export PATH=/build/bin:$PATH
 
-# At this time it's necessary to build spread manually because
-# the snapped version does not include the qemu/kvm backend.
-# Once the snapped version includes this backend, then we can
-# change the manual building of spread with making sure the snap
-# package is installed.
-export GOPATH=$(mktemp -d)
-SPREAD_SRC=\$GOPATH/src/github.com/snapcore/spread
-mkdir -p "\$SPREAD_SRC"
-git clone https://git.launchpad.net/~snappy-hwe-team/snappy-hwe-snaps/+git/spread "\$SPREAD_SRC"
-go get -d -v github.com/snapcore/spread/... || true
-
-# This is to go back to a version of the crypto package that still supports go 1.6
-# Eventually we should move to a newer golang version
-cd "\$GOPATH"/go/src/golang.org/x/crypto/
-git checkout 12dd70caea0268ac0d6c2707d0611ef601e7c64e
-cd -
-
-go build github.com/snapcore/spread/cmd/spread
-mkdir /build/bin
-cp spread /build/bin
+# Use a pre-built spread, as it is impossible to build it on xenial due
+# to golang libs becoming incompatible with 1.6
+git clone https://git.launchpad.net/~snappy-hwe-team/snappy-hwe-snaps/+git/spread
+mkdir -p /build/bin
+cp spread/bin/spread /build/bin
 
 git clone --depth 1 -b $CI_BRANCH git+ssh://$[e-mail]/~$LAUNCHPAD_TEAM/$LAUNCHPAD_PROJECT/+git/$CI_REPO /build/src
 cd /build/src
diff --git a/tools/test-snap.sh b/tools/test-snap.sh
index 35f3070..3e6424b 100755
--- a/tools/test-snap.sh
+++ b/tools/test-snap.sh
@@ -35,26 +35,11 @@ export TERM=linux
 export DEBIAN_FRONTEND=noninteractive
 export PATH=/build/bin:$PATH
 
-# At this time it's necessary to build spread manually because
-# the snapped version does not include the qemu/kvm backend.
-# Once the snapped version includes this backend, then we can
-# change the manual building of spread with making sure the snap
-# package is installed.
-export GOPATH=$(mktemp -d)
-SPREAD_SRC=\$GOPATH/src/github.com/snapcore/spread
-mkdir -p "\$SPREAD_SRC"
-git clone https://git.launchpad.net/~snappy-hwe-team/snappy-hwe-snaps/+git/spread "\$SPREAD_SRC"
-go get -d -v github.com/snapcore/spread/... || true
-
-# This is to go back to a version of the crypto package that still supports go 1.6
-# Eventually we should move to a newer golang version
-cd "\$GOPATH"/go/src/golang.org/x/crypto/
-git checkout 12dd70caea0268ac0d6c2707d0611ef601e7c64e
-cd -
-
-go build github.com/snapcore/spread/cmd/spread
-mkdir /build/bin
-cp spread /build/bin
+# Use a pre-built spread, as it is impossible to build it on xenial due
+# to golang libs becoming incompatible with 1.6
+git clone https://git.launchpad.net/~snappy-hwe-team/snappy-hwe-snaps/+git/spread
+mkdir -p /build/bin
+cp spread/bin/spread /build/bin
 
 git clone --depth 1 -b $BRANCH $REPO /build/src
 cd /build/src