Merge ~morphis/snappy-hwe-snaps/+git/build-scripts:f/allow-snap-snapcraft-yaml into ~snappy-hwe-team/snappy-hwe-snaps/+git/build-scripts:master

[Simon Fels]

Allow snap/snapcraft.yaml next to a top level snapcraft.yaml

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

PASSED: Continuous integration, rev:c52ea18b1a2742ec113f920808cf76c70e8b91f3
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1595/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/1975
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1503/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/2349

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

review: Approve (continuous-integration)

[Roberto Mier Escandon (rmescandon)]

lgtm

review: Approve

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

Looks good, just a couple of nitpiks

review: Needs Fixing

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

LGTM

review: Approve

diff --git a/jobs/generic-build-snap-worker b/jobs/generic-build-snap-worker
index 81a7709..bb72cee 100755
--- a/jobs/generic-build-snap-worker
+++ b/jobs/generic-build-snap-worker
@@ -40,9 +40,17 @@ fi
 # $SOURCE_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
 	git checkout $branch
+	
 	if [ -e snapcraft.yaml ]; then
+		SNAPCRAFT_YAML_PATH=snapcraft.yaml
+	elif [ -e snap/snapcraft.yaml ]; then
+		SNAPCRAFT_YAML_PATH=snap/snapcraft.yaml
+	fi
+
+	if [ -n "$SNAPCRAFT_YAML_PATH" ]; then
 		CI_BRANCH=$branch
 		break
 	fi
@@ -57,15 +65,17 @@ 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=$(cat snapcraft.yaml | grep -v ^\# | head -n 5 | grep "^name:" | awk '{print $2}')
+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=$REPO_NAME-$BUILD_ID-$SNAP_REV
 
-sed -i "s/~snappy-hwe-team\/snappy-hwe-snaps\/+git\/$REPO_NAME/~snappy-hwe-team\/snappy-hwe-snaps\/+git\/$CI_REPO/g" snapcraft.yaml
+sed -i "s/~snappy-hwe-team\/snappy-hwe-snaps\/+git\/$REPO_NAME/~snappy-hwe-team\/snappy-hwe-snaps\/+git\/$CI_REPO/g" \
+	$SNAPCRAFT_YAML_PATH
+
 # Commit only when anything has been changed as otherwise the whole
 # job will be marked as failed
 if ! git diff --exit-code &>/dev/null; then
-	git add snapcraft.yaml
+	git add $SNAPCRAFT_YAML_PATH
 	git commit -m "jenkins-ci: Fix paths"
 fi
 
diff --git a/jobs/generic-release-snap b/jobs/generic-release-snap
index 2ca6a04..a6f5908 100755
--- a/jobs/generic-release-snap
+++ b/jobs/generic-release-snap
@@ -37,9 +37,12 @@ set_git_identity() {
   git config user.email "[e-mail]"
 }
 
+# Arguments are:
+# $1 Version to be set in the snapcraft.yaml file
+# $2 Path to the snapcraft.yaml file
 bump_version_and_tag() {
-  sed -i -e "s/^version:\ .*/version: $1/g" snapcraft.yaml
-  git add snapcraft.yaml
+  sed -i -e "s/^version:\ .*/version: $1/g" $2
+  git add $2
   git commit -m "Bump version to $1"
   git tag -a -m "$1" $1 HEAD
 }
@@ -52,13 +55,20 @@ fi
 git clone -b $RELEASE_BASE_BRANCH $REPOSITORY_URL $SNAP_NAME
 cd $SNAP_NAME
 
-if [ ! -e snapcraft.yaml ]; then
-  echo "ERROR: No top-level snapcraft.yaml file!"
+SNAPCRAFT_YAML_PATH=
+if [ -e snapcraft.yaml ]; then
+    SNAPCRAFT_YAML_PATH=snapcraft.yaml
+elif [ -e snap/snapcraft.yaml ]; then
+    SNAPCRAFT_YAML_PATH=snap/snapcraft.yaml
+fi
+
+if [ -z "$SNAPCRAFT_YAML_PATH" ]; then
+  echo "ERROR: No snapcraft.yaml or snap/snapcraft.yaml file!"
   exit 1
 fi
 
 set_git_identity
-bump_version_and_tag $VERSION
+bump_version_and_tag $VERSION $SNAPCRAFT_YAML_PATH
 
 if [ "$RELEASE_FROM_STABLE" -eq 1 ]; then
   git push origin $RELEASE_BASE_BRANCH
@@ -87,8 +97,8 @@ else
   $WORKSPACE/build-scripts/scripts/trigger-lp-build.py -s $SNAP_NAME -p
 
   git checkout $RELEASE_BASE_BRANCH
-  sed -i -e "s/^version:\ .*/version: ${NEXT_VERSION}-dev/g" snapcraft.yaml
-  git add snapcraft.yaml
+  sed -i -e "s/^version:\ .*/version: ${NEXT_VERSION}-dev/g" $SNAPCRAFT_YAML_PATH
+  git add $SNAPCRAFT_YAML_PATH
   git commit -m "Open development for ${NEXT_VERSION}-dev"
   git push origin $RELEASE_BASE_BRANCH
 fi