1
diff --git a/jobs/generic-release-snap b/jobs/generic-release-snap
2
index fffc8fb..b82bf68 100755
3
--- a/jobs/generic-release-snap
4
+++ b/jobs/generic-release-snap
5
@@ -23,6 +23,7 @@ fi
6
23
23
7
24
echo "Snap to be release: $SNAP_NAME"
24
echo "Snap to be release: $SNAP_NAME"
8
25
echo "Version to be released: $VERSION"
25
echo "Version to be released: $VERSION"
9
26
echo "New development version: $NEXT_VERSION"
10
26
27
11
27
GIT_USER=system-enablement-ci-bot
28
GIT_USER=system-enablement-ci-bot
12
28
REPOSITORY_URL="git+ssh://$GIT_USER@git.launchpad.net/~snappy-hwe-team/snappy-hwe-snaps/+git/$SNAP_NAME"
29
REPOSITORY_URL="git+ssh://$GIT_USER@git.launchpad.net/~snappy-hwe-team/snappy-hwe-snaps/+git/$SNAP_NAME"
13
@@ -31,37 +32,54 @@ if [ -e $SNAP_NAME ]; then
14
31
  rm -rf $SNAP_NAME
32
  rm -rf $SNAP_NAME
15
32
fi
33
fi
16
33
34
18
34
git clone -b master $REPOSITORY_URL $SNAP_NAME
35
set_git_identity() {
19
36
  git config user.name "System Enablement CI Bot"
20
37
  git config user.email "ce-system-enablement@lists.canonical.com"
21
38
}
22
39
23
40
bump_version_and_tag() {
24
41
  sed -i -e "s/^version:\ .*/version: $1/g" snapcraft.yaml
25
42
  git add snapcraft.yaml
26
43
  git commit -m "Bump version to $1"
27
44
  git tag -a -m "$1" $1 HEAD
28
45
}
29
46
30
47
RELEASE_BASE_BRANCH=master
31
48
if [ "$RELEASE_FROM_STABLE" -eq 1 ]; then
32
49
  RELEASE_BASE_BRANCH=stable
33
50
fi
34
51
35
52
git clone -b $RELEASE_BASE_BRANCH $REPOSITORY_URL $SNAP_NAME
36
35
cd $SNAP_NAME
53
cd $SNAP_NAME
37
36
54
38
37
if [ ! -e snapcraft.yaml ]; then
55
if [ ! -e snapcraft.yaml ]; then
41
38
    echo "ERROR: No top-level snapcraft.yaml file!"
56
  echo "ERROR: No top-level snapcraft.yaml file!"
42
39
    exit 1
57
  exit 1
43
40
fi
58
fi
44
41
59
51
42
git config user.name "System Enablement CI Bot"
60
set_git_identity
52
43
git config user.email "ce-system-enablement@lists.canonical.com"
61
bump_version_and_tag $VERSION
47
44
48
45
sed -i -e "s/^version:\ .*/version: $VERSION/g" snapcraft.yaml
49
46
git add snapcraft.yaml
50
47
git commit -m "Bump version to $VERSION"
53
48
62
57
49
git tag -a -m "$VERSION" $VERSION HEAD
63
if [ "$RELEASE_FROM_STABLE" -eq 1 ]; then
58
50
if ! git branch -r | grep origin/stable ; then
64
  git push origin $RELEASE_BASE_BRANCH
59
51
    git checkout -b stable origin/master
65
  git push origin $VERSION
60
52
else
66
else
64
53
    git checkout -b stable origin/stable
67
  if ! git branch -r | grep origin/stable ; then
65
54
fi
68
      git checkout -b stable origin/master
66
55
git merge master
69
  else
67
70
      git checkout -b stable origin/stable
68
71
  fi
69
72
  git merge $RELEASE_BASE_BRANCH
70
56
73
74
57
git push origin stable
74
  git push origin stable
75
58
git push origin master
75
  git push origin $RELEASE_BASE_BRANCH
76
59
git push origin $VERSION
76
  git push origin $VERSION
77
60
77
83
61
git checkout master
78
  git checkout $RELEASE_BASE_BRANCH
84
62
sed -i -e "s/^version:\ .*/version: ${NEXT_VERSION}-dev/g" snapcraft.yaml
79
  sed -i -e "s/^version:\ .*/version: ${NEXT_VERSION}-dev/g" snapcraft.yaml
85
63
git add snapcraft.yaml
80
  git add snapcraft.yaml
86
64
git commit -m "Open development for ${NEXT_VERSION}-dev"
81
  git commit -m "Open development for ${NEXT_VERSION}-dev"
87
65
git push origin master
82
  git push origin $RELEASE_BASE_BRANCH
88
83
fi
89
66
84
90
67
exec $WORKSPACE/build-scripts/scripts/trigger-lp-build.py -s $SNAP_NAME -p
85
exec $WORKSPACE/build-scripts/scripts/trigger-lp-build.py -s $SNAP_NAME -p
Status:	Merged
Approved by:	Konrad Zapałowicz on 2017-03-22
Approved revision:	6c9b4f1654424ad8152c578a37a888f287e8b195
Merged at revision:	a8e48d04a58cf06008625f93701c7d1080347113
Proposed branch:	~morphis/snappy-hwe-snaps/+git/build-scripts:f/release-from-stable
Merge into:	~snappy-hwe-team/snappy-hwe-snaps/+git/build-scripts:master
Diff against target:	90 lines (+41/-23) 1 file modified jobs/generic-release-snap (+41/-23)
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Jim Hodapp (community)			Approve on 2017-03-21
Konrad Zapałowicz (community)	code		Approve on 2017-03-21
System Enablement Bot	continuous-integration	2017-03-20	Approve on 2017-03-20
Review via email: mp+320344@code.launchpad.net