Merge ~alfonsosanchezbeato/snappy-hwe-snaps/+git/build-scripts:build-from-master into ~snappy-hwe-team/snappy-hwe-snaps/+git/build-scripts:master

[Alfonso Sanchez-Beato]

Always build from master the branch.

Always build from master the branch.

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

PASSED: Continuous integration, rev:7a7b8723e1631d301476dbb6ddf3de5aedf8cdf9
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1198/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/246
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1106/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/921

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:26b37aa903fb34efd5e0dbf7d2facee5f7783dcd
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1208/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/256
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1116/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/925

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:14583717153d648e64aed526979c4922d6c03b61
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1212/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/260
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1120/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/928

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:09a406bb61e6a00ee56f18bdb8d3552716a07e44
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1214/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/262
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1121/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/929

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:4ea30ddf314d97fe739cccd29e4430425b7659c7
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1216/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/264
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1122/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/930

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:1d6d8dcf6460897c3babc72ce7b525c26f1685ab
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1218/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/266
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1125/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/934

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:07676e97b457e56646d6640799b00f82c13474b0
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1222/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/270
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1129/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/938

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

review: Approve (continuous-integration)

[Simon Fels (morphis)]

review: Needs Fixing

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

Comments addressed.

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

PASSED: Continuous integration, rev:24d4ea9b0740f294e2d446a24f27d0c63ccabe9f
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1224/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/272
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1132/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/940

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

review: Approve (continuous-integration)

[Jim Hodapp (jhodapp)]

LGTM

review: Approve

[Simon Fels (morphis)]

LGTM

review: Approve

diff --git a/jobs/generic-build-snap-worker b/jobs/generic-build-snap-worker
index d0008df..074318d 100755
--- a/jobs/generic-build-snap-worker
+++ b/jobs/generic-build-snap-worker
@@ -33,17 +33,27 @@ if [ -n "$SOURCE_GIT_REPO" ]; then
 		$REVISION
 fi
 
+# Always build against master so all tests are performed
+CI_BRANCH=master
+
+git checkout $CI_BRANCH
 if [ ! -e snapcraft.yaml ] ; then
 	echo "WARNING: Can't build snap as no snapcraft.yaml exists!"
 	exit 0
 fi
 
+REPO_NAME=$(awk -v a="$TARGET_GIT_REPO" 'BEGIN{print substr(a, index(a, "+git/") + 5)}')
 SNAP_NAME=$(grep "name:" snapcraft.yaml | awk '{print $2}')
 SNAP_REV=$(git rev-parse --short HEAD)
-CI_BRANCH=build/$SNAP_NAME-$BUILD_ID-$SNAP_REV
-git checkout -b $CI_BRANCH
-git remote add jenkins-ci git+ssh://[e-mail]/~snappy-hwe-team/snappy-hwe-snaps/+git/jenkins-ci-builds
-git push jenkins-ci $CI_BRANCH
+CI_REPO=$REPO_NAME-$BUILD_ID-$SNAP_REV
+
+sed -i "s/~snappy-hwe-team\/snappy-hwe-snaps\/+git\/$REPO_NAME/~snappy-hwe-team\/snappy-hwe-snaps\/+git\/$CI_REPO/g" snapcraft.yaml
+git add snapcraft.yaml
+git commit -m "jenkins-ci: Fix paths"
+
+git remote add jenkins-ci git+ssh://[e-mail]/~snappy-hwe-team/snappy-hwe-snaps/+git/$CI_REPO
+git push jenkins-ci --all
+git push jenkins-ci --tags
 
 EXTRA_ARGS=
 if [ -n "$ARCHITECTURES" ]; then
@@ -52,13 +62,13 @@ fi
 
 $WORKSPACE/build-scripts/scripts/trigger-lp-build.py \
     -s $SNAP_NAME -n \
-    --git-repo=https://git.launchpad.net/~snappy-hwe-team/snappy-hwe-snaps/+git/jenkins-ci-builds \
+    --git-repo=https://git.launchpad.net/~snappy-hwe-team/snappy-hwe-snaps/+git/$CI_REPO \
     --git-repo-branch=$CI_BRANCH \
     --results-dir=$WORKSPACE/results \
     $EXTRA_ARGS
-# When build has finished (regardless of its result) we remove our CI branch
-# to keep the CI repository clean.
-git push jenkins-ci :$CI_BRANCH
+# When build has finished remove the repository we just created
+$WORKSPACE/build-scripts/scripts/delete-ci-repo.py \
+    --git-repo=https://git.launchpad.net/~snappy-hwe-team/snappy-hwe-snaps/+git/$CI_REPO
 if [ $? -ne 0 ]; then
     exit 1
 fi
diff --git a/scripts/delete-ci-repo.py b/scripts/delete-ci-repo.py
new file mode 100755
index 0000000..35c762d
--- /dev/null
+++ b/scripts/delete-ci-repo.py
@@ -0,0 +1,45 @@
+#!/usr/bin/env python
+#
+# Copyright (C) 2017 Canonical Ltd
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+from launchpadlib.launchpad import Launchpad
+
+from argparse import ArgumentParser
+
+import se_utils
+
+print("Running delete-ci-repo")
+
+parser = ArgumentParser(description="Delete a git repository stored in launchpad")
+parser.add_argument('--git-repo', help="Git repository to be deleted")
+
+args = vars(parser.parse_args())
+
+git_repo = args['git_repo']
+ind = git_repo.find('~')
+if ind == -1:
+    print("Bad git repo {}".format(git_repo))
+    exit(1)
+
+lp_repo = git_repo[ind:]
+
+lp_app = se_utils.get_config_option("lp_app")
+lp_env = se_utils.get_config_option("lp_env")
+credential_store_path = se_utils.get_config_option('credential_store_path')
+launchpad = se_utils.get_launchpad(None, credential_store_path, lp_app, lp_env)
+
+repo = launchpad.git_repositories.getByPath(path=lp_repo)
+print("Removing {}".format(lp_repo))
+repo.lp_delete()