Merge ~kzapalowicz/snappy-hwe-snaps/+git/build-scripts:fix/snap-version-issue into ~snappy-hwe-team/snappy-hwe-snaps/+git/build-scripts:master

[Konrad Zapałowicz]

Fix empty snap name for files with comments on top.

Some snapcraft.yaml files have a header that contains
commented-out version information. Due to that the name is not
within first five lines.

This commit makes the snap name rule skip the lines that start
with the comment '#'

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

PASSED: Continuous integration, rev:e82f413650d6a89f56b79bbfeafbc5275419e84b
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1319/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/498
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1227/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/1139

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:e82f413650d6a89f56b79bbfeafbc5275419e84b
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1320/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/499
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1228/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/1140

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

review: Approve (continuous-integration)

[Jim Hodapp (jhodapp)]

LGTM

review: Approve

[Jim Hodapp (jhodapp)]

I also tested this locally against as many snap projects as I could. Seems like a solid change.

diff --git a/jobs/generic-build-snap-worker b/jobs/generic-build-snap-worker
index 504edd8..d9ab177 100755
--- a/jobs/generic-build-snap-worker
+++ b/jobs/generic-build-snap-worker
@@ -49,7 +49,7 @@ REPO_NAME=$(awk -v a="$TARGET_GIT_REPO" 'BEGIN{print substr(a, index(a, "+git/")
 # 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_NAME=$(cat snapcraft.yaml | grep -v ^\# | head -n 5 | grep "^name:" | awk '{print $2}')
 SNAP_REV=$(git rev-parse --short HEAD)
 CI_REPO=$REPO_NAME-$BUILD_ID-$SNAP_REV