Merge ~morphis/snappy-hwe-snaps/+git/build-scripts:b/multiple-name-fields into ~snappy-hwe-team/snappy-hwe-snaps/+git/build-scripts:master

[Simon Fels]

Check only first five lines of snapcraft.yaml for the name: field

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

FAILED: Continuous integration, rev:59ba4c9de5043194b7ce816ff4d65dc33d8002e8
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1257/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/326/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1164/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/986/console

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

review: Needs Fixing (continuous-integration)

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

LGTM

review: Approve

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

FAILED: Continuous integration, rev:fa8193bf2dd64e1474e924382a881921bb56abef
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1258/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/327/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1165/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/987/console

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

review: Needs Fixing (continuous-integration)

[Simon Fels (morphis)]

review: Approve (continuous-integration)

diff --git a/jobs/generic-build-snap-worker b/jobs/generic-build-snap-worker
index 24b1ce9..83345f5 100755
--- a/jobs/generic-build-snap-worker
+++ b/jobs/generic-build-snap-worker
@@ -48,7 +48,10 @@ if [ ! -e snapcraft.yaml ] ; then
 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}')
+# 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=$(head -n 5 snapcraft.yaml | grep "^name:" | awk '{print $2}')
 SNAP_REV=$(git rev-parse --short HEAD)
 CI_REPO=$REPO_NAME-$BUILD_ID-$SNAP_REV