Specify the release version.
- VERSION=2.5.4
+ VERSION=2.6.3
## 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)
+Check issues at https://github.com/Icinga/icinga2
## Backport Commits
- $ git checkout master
- $ ./pick.py -V $VERSION
-
-The script creates a new branch 'auto-merged-<VERSION>' 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.5
- $ git merge --ff-only auto-merged-2.5.3
+For minor versions you need to manually backports any and all commits from the
+master branch which should be part of this release.
## Authors
## 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
Example:
gsed -i "s/Version: .*/Version: $VERSION/g" icinga2.spec
- gsed -i "s/<version>.*<\/version>/<version>$VERSION<\/version>/g" icinga2.nuspec
- gsed -i "s/Icinga2-v.*-/Icinga2-v$VERSION-/g" tools/chocolateyInstall.ps1
## 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:
-
- $ ./changelog.py -V $VERSION
-
-Docs:
-
- $ ./changelog.py -V $VERSION -l
-
-Wordpress:
-
- $ ./changelog.py -V $VERSION -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
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.
* 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.
$ 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 https://packages.icinga.com/epel/7/release/noarch/icinga-rpm-release-7-1.el7.centos.noarch.rpm
# yum -y install icinga2
# icinga2 daemon -C
Install the created icinga2 package locally:
- choco install icinga2 -version 2.5.4 -fdv "%cd%" -source "'%cd%;https://chocolatey.org/api/v2/'"
+ choco install icinga2 -version 2.6.3 -fdv "%cd%" -source "'%cd%;https://chocolatey.org/api/v2/'"
Upload the package to [chocolatey](https://chocolatey.org/packages/upload).
## 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)
+* 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
projects / icinga2 / blobdiff