Issue #2861216: Prepare release script

release.sh

@@ -52,6 +52,7 @@ The following operations will be done:
  0. prompt you for a debian/changelog entry
  1. change the makefile to download tarball
  2. change the upgrade.sh.txt version
+  . change the .gitlab-ci.yml to build a release package
  3. display the resulting diff
  4. commit those changes to git
  5. lay down the tag
@@ -61,8 +62,6 @@ The following operations will be done:
  9. clone fresh copies of golden contrib to lay down the tag
 10. (optionally) push those changes
 
- ARE YOU SURE you disabled the D_aegir-debian-build-3x job in Jenkins?
-
 The operation can be aborted before step 8. Don't forget that as
 long as changes are not pushed upstream, this can all be reverted (see
 git-reset(1) and git-revert(1) ).
@@ -92,6 +91,9 @@ git add provision.info && rm provision.info.tmp
 echo changing upgrade.sh.txt version
 sed -i'.tmp' -e"s/AEGIR_VERSION=.*$/AEGIR_VERSION=\"$major-$version\"/" upgrade.sh.txt && git add upgrade.sh.txt && rm upgrade.sh.txt.tmp
 
+echo updating the package version scheme, dev packages get a buildID added, released do not.
+sed -i -e"s/new_version=.*$/new_version=\"\${version}\"/" .gitlab-ci.yml && git add .gitlab-ci.yml
+
 echo resulting changes to be committed:
 git diff --cached | cat
 
@@ -157,8 +159,8 @@ echo =========
 echo
 # Can we push?
 if prompt_yes_no "Push tags and commits upstream? "; then
-    # this makes sure we push the commit *and* the tag
-    git push --tags origin HEAD
+    # this makes sure we push the commit *and* the tag, and leave the revert commit for the moment.
+    git push --tags origin tag $NEW_TAG:$CURRENT_BRANCH
     git --work-tree=build-area/hostmaster --git-dir=build-area/hostmaster/.git push --tags origin HEAD
     git --work-tree=build-area/hosting --git-dir=build-area/hosting/.git push --tags origin HEAD
     git --work-tree=build-area/eldir --git-dir=build-area/eldir/.git push --tags origin HEAD
@@ -187,3 +189,7 @@ if prompt_yes_no "Push tags and commits for GOLDEN CONTRIB upstream? "; then
     git --work-tree=build-area/$shortname --git-dir=build-area/$shortname/.git push --tags origin HEAD
   done
 fi
+
+if prompt_yes_no "Is GitLab finished building the release packages? Then we can push the revert commit. "; then
+   git push origin
+fi