Merge ~morphis/snappy-hwe-snaps/+git/jenkins-jobs:f/cleanup-workspace into ~snappy-hwe-team/snappy-hwe-snaps/+git/jenkins-jobs:master

[Simon Fels]

This will ensure that each build will start with an empty workspace. The script takes care that we don't erase the cloned jenkins-jobs repository.

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

PASSED: Continuous integration, rev:5cfc29eefd26a02979d5c245f75ed1de734f6b9f
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1898/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/3150
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1806/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/3415

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

review: Approve (continuous-integration)

[Konrad Zapałowicz (kzapalowicz)]

ack

review: Approve (code)

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

Some issues, see below.

review: Needs Fixing

[Simon Fels (morphis)]

Fixed.

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

PASSED: Continuous integration, rev:02e50b7834b8614b3c8fe1451976726920716bb3
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1900/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/3152
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1808/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/3417

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

review: Approve (continuous-integration)

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

LGTM

review: Approve

diff --git a/jobs/image/common-job-prepare.sh b/jobs/image/common-job-prepare.sh
index 25c4950..6d5779e 100644
--- a/jobs/image/common-job-prepare.sh
+++ b/jobs/image/common-job-prepare.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -ex
 #
 # Copyright (C) 2017 Canonical Ltd
 #
@@ -25,6 +25,15 @@
 #
 # This file will be sourced by all jobs.
 
+# Ensure we have a clean and empty workspace but keep our jenkins-jobs
+# repository so we don't have to clone it again
+for f in $(ls "${{WORKSPACE}}"); do
+	if [ "${{f}}" = jenkins-jobs ]; then
+		continue
+	fi
+	rm -rf "${{WORKSPACE}}"/"${{f}}"
+done
+
 cat << EOF > $WORKSPACE/.build_env
 BOT_USERNAME={bot_username}
 LAUNCHPAD_PROJECT={launchpad_project}
diff --git a/jobs/snap/common-job-prepare.sh b/jobs/snap/common-job-prepare.sh
index 805a0ca..8c622ae 100644
--- a/jobs/snap/common-job-prepare.sh
+++ b/jobs/snap/common-job-prepare.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -ex
 #
 # Copyright (C) 2017 Canonical Ltd
 #
@@ -28,9 +28,15 @@
 JENKINS_JOBS_GIT_REPO="{jobs-git-repo}"
 JENKINS_JOBS_GIT_REPO_BRANCH="{jobs-git-repo-branch}"
 
-if [ -n "${{CLEANUP_WORKSPACE}}" ] && [ "${{CLEANUP_WORKSPACE}}" -eq 1 ]; then
-	rm -rf ${{WORKSPACE}}/*
-fi
+# Ensure we have a clean and empty workspace but keep our jenkins-jobs
+# repository so we don't have to clone it again
+for f in $(ls "${{WORKSPACE}}"); do
+	if [ "${{f}}" = jenkins-jobs ]; then
+		continue
+	fi
+	rm -rf "${{WORKSPACE}}"/"${{f}}"
+done
+
 if [ -e jenkins-jobs ] ; then
 	(cd jenkins-jobs ; git clean -fdx . ; git fetch origin ; git reset --hard origin/${{JENKINS_JOBS_GIT_REPO_BRANCH}})
 else