Merge ~morphis/snappy-hwe-snaps/+git/jenkins-jobs:no-ci-branch-in-prepare into ~snappy-hwe-team/snappy-hwe-snaps/+git/jenkins-jobs:master

[Simon Fels]

jobs/snap: don't require a branch with a snapcraft.yaml

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

FAILED: Continuous integration, rev:b878551669a2ebc4f8267e410b14cf91834682c7
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/56/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/56/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/56/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/56/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/56/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:89221dc66e2a6c26cb79e68e98d653b3717fc06d
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/57/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/57/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/57/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/57/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/57/console

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

review: Needs Fixing (continuous-integration)

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

LGTM

review: Approve

[Simon Fels (morphis)]

review: Approve (continuous-integration)

diff --git a/jobs/snap/snap-build-prepare.sh b/jobs/snap/snap-build-prepare.sh
index 77940d1..7639530 100644
--- a/jobs/snap/snap-build-prepare.sh
+++ b/jobs/snap/snap-build-prepare.sh
@@ -49,7 +49,6 @@ fi
 # Try to find the correct branch we need to build from. In the case that
 # $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 $TARGET_GIT_REPO_BRANCH master ; do
 	git checkout $branch
@@ -60,28 +59,20 @@ for branch in $TARGET_GIT_REPO_BRANCH master ; do
 	fi
 
 	if [ -n "$SNAPCRAFT_YAML_PATH" ]; then
-		CI_BRANCH=$branch
 		break
 	fi
 done
 
-if [ -z "$CI_BRANCH" ]; 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)}')
-# We rely on the snapcraft.yaml to have the snap name in the first five lines
-# which is the case for all our snaps. This is a bit lazy but the best way to
-# ensure we don't fetch any other name: fields which might be present in the file.
-SNAP_NAME=$(cat $SNAPCRAFT_YAML_PATH | grep -v ^\# | head -n 5 | grep "^name:" | awk '{print $2}')
 SNAP_REV=$(git rev-parse --short HEAD)
 CI_REPO=ci-build-$CI_ID
 
-sed -i "s/~$LAUNCHPAD_TEAM\/$LAUNCHPAD_PROJECT\/+git\/$REPO_NAME/~$LAUNCHPAD_TEAM\/$LAUNCHPAD_PROJECT\/+git\/$CI_REPO/g" \
-	$SNAPCRAFT_YAML_PATH
-git add snapcraft.yaml
-git commit -m "Update snapcraft.yaml to build from right repository"
+if [ -n "$SNAPCRAFT_YAML_PATH" ]; then
+	sed -i "s/~$LAUNCHPAD_TEAM\/$LAUNCHPAD_PROJECT\/+git\/$REPO_NAME/~$LAUNCHPAD_TEAM\/$LAUNCHPAD_PROJECT\/+git\/$CI_REPO/g" \
+		$SNAPCRAFT_YAML_PATH
+	git add snapcraft.yaml
+	git commit -m "Update snapcraft.yaml to build from right repository"
+fi
 
 git remote add jenkins-ci git+ssh://$[e-mail]/~$LAUNCHPAD_TEAM/$LAUNCHPAD_PROJECT/+git/$CI_REPO
 git push jenkins-ci --all