Merge ~morphis/snappy-hwe-snaps/+git/jenkins-jobs:f/correct-snap-type-check into ~snappy-hwe-team/snappy-hwe-snaps/+git/jenkins-jobs:master

[Simon Fels]

Use app as snap type when snapcraft.yaml doesn't specify one

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

LGTM

review: Approve

[Roberto Mier Escandon (rmescandon)]

lgtm

review: Approve

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

PASSED: Continuous integration, rev:ceafb092471f1c223507282361cefd9933af7782
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1686/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/2226
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1594/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/2589

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

review: Approve (continuous-integration)

[Konrad Zapałowicz (kzapalowicz)]

ack

review: Approve (code)

diff --git a/jobs/snap/snap-build-worker.sh b/jobs/snap/snap-build-worker.sh
index 0c62b2c..72a5c2e 100644
--- a/jobs/snap/snap-build-worker.sh
+++ b/jobs/snap/snap-build-worker.sh
@@ -83,7 +83,7 @@ sed -i "s/~$LAUNCHPAD_TEAM\/$LAUNCHPAD_PROJECT\/+git\/$REPO_NAME/~$LAUNCHPAD_TEA
 
 if [ "$BUILD_ON_LAUNCHPAD" = False ]; then
 	SNAPBUILD_EXTRA_ARGS=
-	SNAP_TYPE=$($BUILD_SCRIPTS/tools/shyaml get-value type < $SNAPCRAFT_YAML_PATH)
+	SNAP_TYPE=$($BUILD_SCRIPTS/tools/shyaml get-value type < $SNAPCRAFT_YAML_PATH || echo app)
 	case "$SNAP_TYPE" in
 		kernel)
 			if [ "$ARCH" != amd64 ]; then