Make sure all Redis tasks are executed on the WQ threads

[icinga2] / RELEASE.md

diff --git a/RELEASE.md b/RELEASE.md
index 3e2d54fc4278c7a0f0138f69858ab4b0edb8199a..63bbd9c89b26e3f8dd1b70da72f0dd5c71d8c755 100644 (file)
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -2,31 +2,18 @@
 
 Print this document.
 
-## Issues
-
-Check the following issue filters:
-
-* [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)
-
-## Backport Commits
-
-    $ git checkout master
-    $ ./pick.py -V 2.5.2
+Specify the release version.
 
-The script creates a new branch 'auto-merged-2.5.2' 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.
+    VERSION=2.6.2
 
-If there are any merge commits you will need to manually fix them and continue the
-rebase until no commits are left:
+## Issues
 
-    $ git rebase --continue
+Check issues at https://github.com/Icinga/icinga2
 
-After finishing the rebase the branch needs to be merged into the support branch:
+## Backport Commits
 
-    $ git checkout support/2.5
-    $ git merge --ff-only auto-merged-2.5.2
+For minor versions you need to manually backports any and all commits from the
+master branch which should be part of this release.
 
 ## Authors
 
@@ -37,34 +24,24 @@ Update the [.mailmap](.mailmap) and [AUTHORS](AUTHORS) files:
 
 ## Version
 
-Update the version number in the following files:
+Update the version number in the following file:
 
 * [icinga2.spec]: Version: (.*)
-* [icinga2.nuspec]: <version>(.*)</version>
-* [tools/chocolateyInstall.ps1]: Icinga2-v(.*)-{x86,x86_64}.msi
-
-## 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:
+Example:
 
-    $ ./changelog.py -V 2.5.0
+    gsed -i "s/Version: .*/Version: $VERSION/g" icinga2.spec
 
-Docs:
-
-    $ ./changelog.py -V 2.5.0 -l
-
-Wordpress:
+## Changelog
 
-    $ ./changelog.py -V 2.5.0 -H -l
+Update the [ChangeLog](ChangeLog), [doc/1-about.md](doc/1-about.md) files. Also generate HTML
+for the wordpress release announcement.
 
 ## 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.
 
@@ -73,11 +50,11 @@ 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.
 
@@ -86,23 +63,24 @@ Push the tag.
 For major releases: Create a new "support" branch:
 
     $ git checkout master
-    $ git checkout -b support/2.5
-    $ git push -u origin support/2.5
+    $ git checkout -b support/2.6
+    $ git push -u origin support/2.6
 
 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.5
+    $ git push -u origin support/2.6
     $ git checkout master
-    $ git cherry-pick support/2.5
-    $ git merge --strategy=ours support/2.5
+    $ git cherry-pick support/2.6
+    $ git merge --strategy=ours support/2.6
     $ 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,7 +88,7 @@ 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](http://packages.icinga.com/windows/) inside a Windows VM.
 
 * Start a new docker container and install/run icinga2.
 
@@ -118,7 +96,7 @@ 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 http://packages.icinga.com/epel/7/release/noarch/icinga-rpm-release-7-1.el7.centos.noarch.rpm
     # yum -y install icinga2
     # icinga2 daemon -C
 
@@ -141,7 +119,7 @@ Create the nupkg package:
 
 Install the created icinga2 package locally:
 
-    choco install icinga2 -version 2.5.2 -fdv "%cd%" -source "'%cd%;https://chocolatey.org/api/v2/'"
+    choco install icinga2 -version 2.6.2 -fdv "%cd%" -source "'%cd%;https://chocolatey.org/api/v2/'"
 
 Upload the package to [chocolatey](https://chocolatey.org/packages/upload).
 
@@ -152,7 +130,7 @@ and pull the current support branch.
 
 ## Announcement
 
-* Create a new blog post on www.icinga.org/blog
+* Create a new blog post on www.icinga.com/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)
 * Update IRC channel topic