1
diff --git a/jobs/generic-release-snap b/jobs/generic-release-snap
2
index b82bf68..29b40b6 100755
3
--- a/jobs/generic-release-snap
4
+++ b/jobs/generic-release-snap
5
@@ -21,7 +21,7 @@ if [ -z "$VERSION" ]; then
6
21
    exit 1
21
    exit 1
7
22
fi
22
fi
8
23
23
10
24
echo "Snap to be release: $SNAP_NAME"
24
echo "Snap to be released: $SNAP_NAME"
11
25
echo "Version to be released: $VERSION"
25
echo "Version to be released: $VERSION"
12
26
echo "New development version: $NEXT_VERSION"
26
echo "New development version: $NEXT_VERSION"
13
27
27
14
@@ -63,6 +63,8 @@ bump_version_and_tag $VERSION
15
63
if [ "$RELEASE_FROM_STABLE" -eq 1 ]; then
63
if [ "$RELEASE_FROM_STABLE" -eq 1 ]; then
16
64
  git push origin $RELEASE_BASE_BRANCH
64
  git push origin $RELEASE_BASE_BRANCH
17
65
  git push origin $VERSION
65
  git push origin $VERSION
18
66
19
67
  $WORKSPACE/build-scripts/scripts/trigger-lp-build.py -s $SNAP_NAME -p
20
66
else
68
else
21
67
  if ! git branch -r | grep origin/stable ; then
69
  if ! git branch -r | grep origin/stable ; then
22
68
      git checkout -b stable origin/master
70
      git checkout -b stable origin/master
23
@@ -75,11 +77,12 @@ else
24
75
  git push origin $RELEASE_BASE_BRANCH
77
  git push origin $RELEASE_BASE_BRANCH
25
76
  git push origin $VERSION
78
  git push origin $VERSION
26
77
79
27
80
  # Build before we change master branch
28
81
  $WORKSPACE/build-scripts/scripts/trigger-lp-build.py -s $SNAP_NAME -p
29
82
30
78
  git checkout $RELEASE_BASE_BRANCH
83
  git checkout $RELEASE_BASE_BRANCH
31
79
  sed -i -e "s/^version:\ .*/version: ${NEXT_VERSION}-dev/g" snapcraft.yaml
84
  sed -i -e "s/^version:\ .*/version: ${NEXT_VERSION}-dev/g" snapcraft.yaml
32
80
  git add snapcraft.yaml
85
  git add snapcraft.yaml
33
81
  git commit -m "Open development for ${NEXT_VERSION}-dev"
86
  git commit -m "Open development for ${NEXT_VERSION}-dev"
34
82
  git push origin $RELEASE_BASE_BRANCH
87
  git push origin $RELEASE_BASE_BRANCH
35
83
fi
88
fi
36
84
37
85
exec $WORKSPACE/build-scripts/scripts/trigger-lp-build.py -s $SNAP_NAME -p
38
diff --git a/scripts/common.sh b/scripts/common.sh
39
index 0986128..c30d2d7 100755
40
--- a/scripts/common.sh
41
+++ b/scripts/common.sh
42
@@ -67,6 +67,13 @@ set_test_type ()
43
67
        HW_TESTS_RESULT=1
67
        HW_TESTS_RESULT=1
44
68
    fi
68
    fi
45
69
69
46
70
    # Components have the ability to disable CI tests if they can't provide any.
47
71
    # This is only accepted in a few cases and should be generally avoided.
48
72
    CI_TESTS_DISABLED=no
49
73
    if [ -e "$tmp_srcdir"/src/.ci_tests_disabled ]; then
50
74
        CI_TESTS_DISABLED=yes
51
75
    fi
52
76
53
70
    rm -rf "$tmp_srcdir"
77
    rm -rf "$tmp_srcdir"
54
71
78
55
72
    if [ "$FAIL" = yes ]; then
79
    if [ "$FAIL" = yes ]; then
56
@@ -74,9 +81,7 @@ set_test_type ()
57
74
        exit 1
81
        exit 1
58
75
    fi
82
    fi
59
76
83
63
77
    # Components have the ability to disable CI tests if they can't provide any.
84
    if [ "$CI_TESTS_DISABLED" = yes ]; then
61
78
    # This is only accepted in a few cases and should be generally avoided.
62
79
    if [ -e "$tmp_srcdir"/src/.ci_tests_disabled ]; then
64
80
        echo "WARNING: Component has no CI tests so not running anything here"
85
        echo "WARNING: Component has no CI tests so not running anything here"
65
81
        exit 0
86
        exit 0
66
82
    fi
87
    fi
Status:	Merged
Approved by:	Jim Hodapp on 2017-04-11
Approved revision:	0a5ece734f7e99fc7b2fc67fca13bce941a4e490
Merged at revision:	d46cf8b2bb1d939a3275104455bee59d1df67ba7
Proposed branch:	~alfonsosanchezbeato/snappy-hwe-snaps/+git/build-scripts:fix-beta-version
Merge into:	~snappy-hwe-team/snappy-hwe-snaps/+git/build-scripts:master
Diff against target:	66 lines (+14/-6) 2 files modified jobs/generic-release-snap (+6/-3) scripts/common.sh (+8/-3)
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Alfonso Sanchez-Beato	continuous-integration		Approve on 2017-04-11
System Enablement Bot	continuous-integration	2017-04-11	Needs Fixing on 2017-04-11
Jim Hodapp (community)			Approve on 2017-04-11
Review via email: mp+322359@code.launchpad.net