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

[Alfonso Sanchez-Beato]

snap-build: build on target branch
We were building the source branch instead of target + merged source
branch.

[Konrad Zapałowicz (kzapalowicz)]

Ack

review: Approve

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

PASSED: Continuous integration, rev:3bcc0869b9c4beb6c69a83ba8c5878e8ff03a413
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1844/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/2846
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1752/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/3132

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

review: Approve (continuous-integration)

[Simon Fels (morphis)]

LGTM

review: Approve

diff --git a/jobs/generic-build-snap-worker b/jobs/generic-build-snap-worker
index bb72cee..8a14d39 100755
--- a/jobs/generic-build-snap-worker
+++ b/jobs/generic-build-snap-worker
@@ -37,13 +37,12 @@ if [ -n "$SOURCE_GIT_REPO" ]; then
 fi
 
 # Try to find the correct branch we need to build from. In the case that
-# $SOURCE_GIT_REPO_BRANCH points us to an upstream component branch we
+# $TARGET_GIT_REPO_BRANCH points us to an upstream component branch we
 # will take master as the next suitable candidate.
 CI_BRANCH=
 SNAPCRAFT_YAML_PATH=
-for branch in $SOURCE_GIT_REPO_BRANCH master ; do
+for branch in $TARGET_GIT_REPO_BRANCH master ; do
 	git checkout $branch
-	
 	if [ -e snapcraft.yaml ]; then
 		SNAPCRAFT_YAML_PATH=snapcraft.yaml
 	elif [ -e snap/snapcraft.yaml ]; then