X-Git-Url: https://granicus.if.org/sourcecode?a=blobdiff_plain;f=RELEASE.md;h=9cfb6d638c7d42cee4c86d4925553d46fd038dc8;hb=6387f5442ec92f56f2bdaa7379b7caf02e91938c;hp=65ef0c92919c02bc884fa44ffb3a8e8b3afad976;hpb=aff13353efa5d4052bcf546c2095f1c25f3c70ae;p=icinga2

diff --git a/RELEASE.md b/RELEASE.md
index 65ef0c929..9cfb6d638 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -1,108 +1,123 @@
 # Release Workflow
 
-Print this document.
+Specify the release version.
 
-## Issues
+```
+VERSION=2.7.2
+```
 
-Check the following issue filters:
+## Issues
 
-* [Pending backports](https://dev.icinga.org/projects/i2/issues?query_id=41)
-* [Invalid target version](https://dev.icinga.org/projects/i2/issues?query_id=55)
+Check issues at https://github.com/Icinga/icinga2
 
 ## Backport Commits
 
-    $ git checkout master
-    $ ./pick.py -V 2.4.6
-
-The script creates a new branch 'auto-merged-2.4.6' which is based on the
-current support branch. It then merges all commits from the 'master' branch which
-reference a ticket for the version that was specified.
-
-If there are any merge commits you will need to manually fix them and continue the
-rebase until no commits are left:
-
-    $ git rebase --continue
-
-After finishing the rebase the branch needs to be merged into the support branch:
-
-    $ git checkout support/2.4
-    $ git merge --ff-only auto-merged-2.4.6
+For minor versions you need to manually backports any and all commits from the
+master branch which should be part of this release.
 
 ## Authors
 
 Update the [.mailmap](.mailmap) and [AUTHORS](AUTHORS) files:
 
-    $ git checkout master
-    $ git log --use-mailmap | grep ^Author: | cut -f2- -d' ' | sort | uniq > AUTHORS
+```
+git checkout master
+git log --use-mailmap | grep '^Author:' | cut -f2- -d' ' | sort | uniq > AUTHORS
+```
 
 ## Version
 
-Update the version number in the following files:
+Update the version in the spec file:
 
-* [icinga2.spec]: Version: (.*)
-* [icinga2.nuspec]: <version>(.*)</version>
-* [tools/chocolateyInstall.ps1]: Icinga2-v(.*)-{x86,x86_64}.msi
+```
+gsed -i "s/Version: .*/Version: $VERSION/g" icinga2.spec
+```
 
 ## Changelog
 
-Update the [ChangeLog](ChangeLog), [doc/1-about.md](doc/1-about.md) files using
-the changelog.py script. Also generate HTML for the wordpress release announcement.
-
-Changelog:
+Update the [CHANGELOG.md](CHANGELOG.md) file.
 
-    $ ./changelog.py -V 2.4.6
+Export these environment variables:
 
-Docs:
+```
+export ICINGA_GITHUB_AUTH_USERNAME='user'
+export ICINGA_GITHUB_AUTH_TOKEN='token'
+export ICINGA_GITHUB_PROJECT='icinga/icinga2'
+```
 
-    $ ./changelog.py -V 2.4.6 -l
+Run the script which updates the [CHANGELOG.md](CHANGELOG.md) file.
 
-Wordpress:
-
-    $ ./changelog.py -V 2.4.6 -H -l
+```
+./changelog.py
+git diff
+```
 
 ## Git Tag
 
 Commit these changes to the "master" branch:
 
-    $ git commit -v -a -m "Release version <VERSION>"
+```
+git commit -v -a -m "Release version $VERSION"
+```
+
+For minor releases: Cherry-pick this commit into the "support" branch:
 
-For minor releases: Cherry-pick this commit into the "support" branch.
+```
+git checkout support/2.7
+git cherry-pick master
+```
 
 Create a signed tag (tags/v<VERSION>) on the "master" branch (for major
 releases) or the "support" branch (for minor releases).
 
 GB:
 
-    $ git tag -u EE8E0720 -m "Version <VERSION>" v<VERSION>
+```
+git tag -u EE8E0720 -m "Version $VERSION" v$VERSION
+```
 
 MF:
 
-    $ git tag -u D14A1F16 -m "Version <VERSION>" v<VERSION>
+```
+git tag -u D14A1F16 -m "Version $VERSION" v$VERSION
+```
 
-Push the tag.
+NH:
 
-    $ git push --tags
+```
+git tag -u 630F89D9 -m "Version $VERSION" v$VERSION
+```
+
+Push the tag:
+
+```
+git push --tags
+```
 
 For major releases: Create a new "support" branch:
 
-    $ git checkout master
-    $ git checkout -b support/2.4
-    $ git push -u origin support/2.4
+```
+git checkout master
+git checkout -b support/2.7
+git push -u origin support/2.7
+```
 
 For minor releases: Push the support branch, cherry-pick the release commit
 into master and merge the support branch:
 
-    $ git push -u origin support/2.4
-    $ git checkout master
-    $ git cherry-pick support/2.4
-    $ git merge --strategy=ours support/2.4
-    $ git push origin master
+```
+git push -u origin support/2.7
+git checkout master
+git cherry-pick support/2.7
+git merge --strategy=ours support/2.7
+git push origin master
+```
 
 # External Dependencies
 
 ## Build Server
 
-* Update Git tags for the release jobs.
+* Verify package build changes for this version.
+* Test the snapshot packages for all distributions beforehand.
 * Build the newly created Git tag for Debian/RHEL/SuSE.
 * Build the newly created Git tag for Windows.
 
@@ -110,40 +125,55 @@ into master and merge the support branch:
 
 * Test DB IDO with MySQL and PostgreSQL.
 * Provision the vagrant boxes and test the release packages.
-* Test the [setup wizard](http://packages.icinga.org/windows/) inside a Windows VM.
+* Test the [setup wizard](https://packages.icinga.com/windows/) inside a Windows VM.
 
 * Start a new docker container and install/run icinga2.
 
 Example for CentOS7:
 
-    $ docker run -ti centos:latest bash
-
-    # yum -y install http://packages.icinga.org/epel/7/release/noarch/icinga-rpm-release-7-1.el7.centos.noarch.rpm
-    # yum -y install icinga2
-    # icinga2 daemon -C
+```
+docker run -ti centos:latest bash
 
-    # systemctl start icinga2
-    # tail -f /var/log/icinga2/icinga2.log
+yum -y install https://packages.icinga.com/epel/icinga-rpm-release-7-latest.noarch.rpm
+yum -y install icinga2
+icinga2 daemon -C
+```
 
 ## GitHub Release
 
 Create a new release for the newly created Git tag.
 https://github.com/Icinga/icinga2/releases
 
+## Chocolatey
+
+Navigate to the git repository on your Windows box which
+already has chocolatey installed. Pull/checkout the release.
+
+Create the nupkg package:
+
+```
+cpack
+```
+
+Install the created icinga2 package locally:
+
+```
+choco install icinga2 -version 2.7.0 -fdv "%cd%" -source "'%cd%;https://chocolatey.org/api/v2/'"
+```
+
+Upload the package to [chocolatey](https://chocolatey.org/packages/upload).
+
 ## Online Documentation
 
-SSH into the web box, navigate into `icinga2-latest/module/icinga2`
-and pull the current support branch.
+Ask @bobapple to update the documentation at docs.icinga.com.
 
 ## Announcement
 
-* Create a new blog post on www.icinga.org/blog
-* Send announcement mail to icinga-announce@lists.icinga.org
-* Social media: [Twitter](https://twitter.com/icinga), [Facebook](https://www.facebook.com/icinga), [G+](http://plus.google.com/+icinga), [Xing](https://www.xing.com/communities/groups/icinga-da4b-1060043), [LinkedIn](https://www.linkedin.com/groups/Icinga-1921830/about)
+* Create a new blog post on www.icinga.com/blog
+* Social media: [Twitter](https://twitter.com/icinga), [Facebook](https://www.facebook.com/icinga), [G+](https://plus.google.com/+icinga), [Xing](https://www.xing.com/communities/groups/icinga-da4b-1060043), [LinkedIn](https://www.linkedin.com/groups/Icinga-1921830/about)
 * Update IRC channel topic
 
 # After the release
 
-* Add new minor version
-* Close the released version
-* Update Redmine filters for the next major/minor version
+* Add new minor version on [GitHub](https://github.com/Icinga/icinga2/milestones).
+* Close the released version on [GitHub](https://github.com/Icinga/icinga2/milestones).