Merge ~morphis/snappy-hwe-snaps/+git/build-scripts:f/release-from-stable into ~snappy-hwe-team/snappy-hwe-snaps/+git/build-scripts:master

[Simon Fels]

Allow doing releases from the stable branch

In some scenarios it is required to do releases from the stable branch instead of master. For this we add an additional RELEASE_FROM_STABLE parameter to the release job which will tell the job to consider stable instead of master for the release steps.

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

PASSED: Continuous integration, rev:3a9728c9af70687a2b57b4df5d58692f9f772490
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1358/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/617
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1265/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/1249

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

review: Approve (continuous-integration)

[Konrad Zapałowicz (kzapalowicz)]

Needs information

review: Needs Fixing (code)

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

PASSED: Continuous integration, rev:6c9b4f1654424ad8152c578a37a888f287e8b195
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1360/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/619
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1268/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/1251

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

review: Approve (continuous-integration)

[Jim Hodapp (jhodapp)]

I'm trying to understand better what scenarios require us to release from stable instead of from master. Can you give an example Simon?

review: Needs Information

[Simon Fels (morphis)]

@Jim: https://trello.com/c/dVtwAPcV is the example in this case. master has evolved much further already with a lot new features and we need to bring a single change to caracalla as a new release of the network-manager snap. This single change was cherry-picked to stable with https://code.launchpad.net/~morphis/snappy-hwe-snaps/+git/network-manager/+merge/320352 and now we need to create a new release on top of what is in stable. This is what the current implementation doesn't allow but we change with this MP. With this we will

 - not merge master into stable
 - tag HEAD of stable with the new VERSION supplied by the user
 - push stable and trigger -publish build

[Konrad Zapałowicz (kzapalowicz)]

ack

review: Approve (code)

[Jim Hodapp (jhodapp)]

Makes sense now Simon. Thanks for the explanation. I assume we'd also want to bring whatever we cherry pick into stable into master as well so that they don't diverge.

review: Approve

[Jim Hodapp (jhodapp)]

Holding off top approving this until you tell me to Simon, just in case it adversely affects our build system.

[Simon Fels (morphis)]

Sure, in the particular case the change is already in master.

diff --git a/jobs/generic-release-snap b/jobs/generic-release-snap
index fffc8fb..b82bf68 100755
--- a/jobs/generic-release-snap
+++ b/jobs/generic-release-snap
@@ -23,6 +23,7 @@ fi
 
 echo "Snap to be release: $SNAP_NAME"
 echo "Version to be released: $VERSION"
+echo "New development version: $NEXT_VERSION"
 
 GIT_USER=system-enablement-ci-bot
 REPOSITORY_URL="git+ssh://$[e-mail]/~snappy-hwe-team/snappy-hwe-snaps/+git/$SNAP_NAME"
@@ -31,37 +32,54 @@ if [ -e $SNAP_NAME ]; then
   rm -rf $SNAP_NAME
 fi
 
-git clone -b master $REPOSITORY_URL $SNAP_NAME
+set_git_identity() {
+  git config user.name "System Enablement CI Bot"
+  git config user.email "[e-mail]"
+}
+
+bump_version_and_tag() {
+  sed -i -e "s/^version:\ .*/version: $1/g" snapcraft.yaml
+  git add snapcraft.yaml
+  git commit -m "Bump version to $1"
+  git tag -a -m "$1" $1 HEAD
+}
+
+RELEASE_BASE_BRANCH=master
+if [ "$RELEASE_FROM_STABLE" -eq 1 ]; then
+  RELEASE_BASE_BRANCH=stable
+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!"
-    exit 1
+  echo "ERROR: No top-level snapcraft.yaml file!"
+  exit 1
 fi
 
-git config user.name "System Enablement CI Bot"
-git config user.email "[e-mail]"
-
-sed -i -e "s/^version:\ .*/version: $VERSION/g" snapcraft.yaml
-git add snapcraft.yaml
-git commit -m "Bump version to $VERSION"
+set_git_identity
+bump_version_and_tag $VERSION
 
-git tag -a -m "$VERSION" $VERSION HEAD
-if ! git branch -r | grep origin/stable ; then
-    git checkout -b stable origin/master
+if [ "$RELEASE_FROM_STABLE" -eq 1 ]; then
+  git push origin $RELEASE_BASE_BRANCH
+  git push origin $VERSION
 else
-    git checkout -b stable origin/stable
-fi
-git merge master
+  if ! git branch -r | grep origin/stable ; then
+      git checkout -b stable origin/master
+  else
+      git checkout -b stable origin/stable
+  fi
+  git merge $RELEASE_BASE_BRANCH
 
-git push origin stable
-git push origin master
-git push origin $VERSION
+  git push origin stable
+  git push origin $RELEASE_BASE_BRANCH
+  git push origin $VERSION
 
-git checkout master
-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 master
+  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