Merge ~alfonsosanchezbeato/snappy-hwe-snaps/+git/build-scripts:fix-beta-version into ~snappy-hwe-team/snappy-hwe-snaps/+git/build-scripts:master

[Alfonso Sanchez-Beato]

The job was creating snaps with version ${NEXT_VERSION}-dev instead of ${VERSION} - fixed that.

The job was creating snaps with version ${NEXT_VERSION}-dev instead of ${VERSION} - fixed that.

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

FAILED: Continuous integration, rev:85c5955a1a55564c747f79c9d40545978d468900
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1455/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/1024/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1363/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/1585/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:1d896be60928ce932bbc2d0578a20c5cb7d90670
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1456/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/1025/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1364/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/1586/console

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

review: Needs Fixing (continuous-integration)

[Jim Hodapp (jhodapp)]

LGTM

review: Approve

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

FAILED: Continuous integration, rev:0a5ece734f7e99fc7b2fc67fca13bce941a4e490
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1457/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/1026/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1365/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/1587/console

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

review: Needs Fixing (continuous-integration)

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

review: Approve (continuous-integration)

diff --git a/jobs/generic-release-snap b/jobs/generic-release-snap
index b82bf68..29b40b6 100755
--- a/jobs/generic-release-snap
+++ b/jobs/generic-release-snap
@@ -21,7 +21,7 @@ if [ -z "$VERSION" ]; then
     exit 1
 fi
 
-echo "Snap to be release: $SNAP_NAME"
+echo "Snap to be released: $SNAP_NAME"
 echo "Version to be released: $VERSION"
 echo "New development version: $NEXT_VERSION"
 
@@ -63,6 +63,8 @@ bump_version_and_tag $VERSION
 if [ "$RELEASE_FROM_STABLE" -eq 1 ]; then
   git push origin $RELEASE_BASE_BRANCH
   git push origin $VERSION
+
+  $WORKSPACE/build-scripts/scripts/trigger-lp-build.py -s $SNAP_NAME -p
 else
   if ! git branch -r | grep origin/stable ; then
       git checkout -b stable origin/master
@@ -75,11 +77,12 @@ else
   git push origin $RELEASE_BASE_BRANCH
   git push origin $VERSION
 
+  # Build before we change master branch
+  $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
   git commit -m "Open development for ${NEXT_VERSION}-dev"
   git push origin $RELEASE_BASE_BRANCH
 fi
-
-exec $WORKSPACE/build-scripts/scripts/trigger-lp-build.py -s $SNAP_NAME -p
diff --git a/scripts/common.sh b/scripts/common.sh
index 0986128..c30d2d7 100755
--- a/scripts/common.sh
+++ b/scripts/common.sh
@@ -67,6 +67,13 @@ set_test_type ()
         HW_TESTS_RESULT=1
     fi
 
+    # Components have the ability to disable CI tests if they can't provide any.
+    # This is only accepted in a few cases and should be generally avoided.
+    CI_TESTS_DISABLED=no
+    if [ -e "$tmp_srcdir"/src/.ci_tests_disabled ]; then
+        CI_TESTS_DISABLED=yes
+    fi
+
     rm -rf "$tmp_srcdir"
 
     if [ "$FAIL" = yes ]; then
@@ -74,9 +81,7 @@ set_test_type ()
         exit 1
     fi
 
-    # Components have the ability to disable CI tests if they can't provide any.
-    # This is only accepted in a few cases and should be generally avoided.
-    if [ -e "$tmp_srcdir"/src/.ci_tests_disabled ]; then
+    if [ "$CI_TESTS_DISABLED" = yes ]; then
         echo "WARNING: Component has no CI tests so not running anything here"
         exit 0
     fi