icinga2/RELEASE.md

165 lines
4.3 KiB
Markdown
Raw Normal View History

2015-12-07 16:29:19 +01:00
# Release Workflow
2015-04-20 16:43:17 +02:00
2015-12-07 16:29:19 +01:00
Print this document.
2015-12-07 16:29:19 +01:00
## Issues
Check the following issue filters:
* [Pending backports](https://dev.icinga.org/projects/i2/issues?query_id=41)
2016-02-23 12:57:09 +01:00
* [Invalid target version](https://dev.icinga.org/projects/i2/issues?query_id=55)
2016-04-20 18:35:19 +02:00
## Backport Commits
2016-04-21 09:51:11 +02:00
$ git checkout master
2016-08-25 08:08:01 +02:00
$ ./pick.py -V 2.5.3
2016-04-20 18:35:19 +02:00
2016-08-25 08:08:01 +02:00
The script creates a new branch 'auto-merged-2.5.3' which is based on the
2016-04-21 09:51:11 +02:00
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:
2016-08-24 14:05:44 +02:00
$ git checkout support/2.5
2016-08-25 08:08:01 +02:00
$ git merge --ff-only auto-merged-2.5.3
2016-04-20 18:35:19 +02:00
## Authors
Update the [.mailmap](.mailmap) and [AUTHORS](AUTHORS) files:
2016-04-21 09:51:11 +02:00
$ git checkout master
$ git log --use-mailmap | grep ^Author: | cut -f2- -d' ' | sort | uniq > AUTHORS
## Version
Update the version number in the following files:
* [icinga2.spec]: Version: (.*)
* [icinga2.nuspec]: <version>(.*)</version>
2016-04-21 09:51:11 +02:00
* [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.
2015-06-18 15:53:08 +02:00
Changelog:
2016-08-22 14:11:50 +02:00
$ ./changelog.py -V 2.5.0
2015-06-18 15:53:08 +02:00
Docs:
2016-08-22 14:11:50 +02:00
$ ./changelog.py -V 2.5.0 -l
2015-06-18 15:53:08 +02:00
Wordpress:
2016-08-22 14:11:50 +02:00
$ ./changelog.py -V 2.5.0 -H -l
2015-06-18 15:53:08 +02:00
## Git Tag
Commit these changes to the "master" branch:
$ git commit -v -a -m "Release version <VERSION>"
For minor releases: Cherry-pick this commit into the "support" branch.
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>
MF:
$ git tag -u D14A1F16 -m "Version <VERSION>" v<VERSION>
Push the tag.
$ git push --tags
For major releases: Create a new "support" branch:
$ git checkout master
2016-08-24 14:05:44 +02:00
$ git checkout -b support/2.5
$ git push -u origin support/2.5
2015-07-15 12:38:15 +02:00
2015-10-22 13:41:31 +02:00
For minor releases: Push the support branch, cherry-pick the release commit
into master and merge the support branch:
2015-07-15 12:38:15 +02:00
2016-08-24 14:05:44 +02:00
$ git push -u origin support/2.5
2015-07-15 12:38:15 +02:00
$ git checkout master
2016-08-24 14:05:44 +02:00
$ git cherry-pick support/2.5
$ git merge --strategy=ours support/2.5
2015-07-15 12:38:15 +02:00
$ git push origin master
2015-04-20 16:43:17 +02:00
# External Dependencies
## Build Server
2015-12-07 16:29:19 +01:00
* Update Git tags for the release jobs.
2016-04-20 18:35:19 +02:00
* Build the newly created Git tag for Debian/RHEL/SuSE.
* Build the newly created Git tag for Windows.
2015-12-07 16:29:19 +01:00
2016-04-20 18:35:19 +02:00
## Release Tests
2015-06-17 14:22:59 +02:00
2016-04-20 18:35:19 +02:00
* Test DB IDO with MySQL and PostgreSQL.
2015-04-20 16:43:17 +02:00
* Provision the vagrant boxes and test the release packages.
2016-04-20 18:35:19 +02:00
* Test the [setup wizard](http://packages.icinga.org/windows/) inside a Windows VM.
* Start a new docker container and install/run icinga2.
2015-06-17 14:22:59 +02:00
Example for CentOS7:
2016-04-20 18:35:19 +02:00
$ docker run -ti centos:latest bash
2015-07-08 12:55:50 +02:00
2015-06-17 14:22:59 +02:00
# yum -y install http://packages.icinga.org/epel/7/release/noarch/icinga-rpm-release-7-1.el7.centos.noarch.rpm
2015-07-08 12:55:50 +02:00
# yum -y install icinga2
# icinga2 daemon -C
2015-06-17 14:22:59 +02:00
# systemctl start icinga2
# tail -f /var/log/icinga2/icinga2.log
## GitHub Release
2015-04-20 16:43:17 +02:00
Create a new release for the newly created Git tag.
2015-04-20 16:43:17 +02:00
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:
2016-08-25 08:08:01 +02:00
choco install icinga2 -version 2.5.3 -fdv "%cd%" -source "'%cd%;https://chocolatey.org/api/v2/'"
Upload the package to [chocolatey](https://chocolatey.org/packages/upload).
2015-04-20 16:43:17 +02:00
## Online Documentation
SSH into the web box, navigate into `icinga2-latest/module/icinga2`
2016-04-20 18:35:19 +02:00
and pull the current support branch.
2015-04-20 16:43:17 +02:00
## Announcement
2015-06-17 14:22:59 +02:00
* Create a new blog post on www.icinga.org/blog
2015-04-20 16:43:17 +02:00
* Send announcement mail to icinga-announce@lists.icinga.org
2015-06-17 14:22:59 +02:00
* 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)
2015-12-07 16:29:19 +01:00
* Update IRC channel topic
# After the release
* Add new minor version
2016-04-20 18:35:19 +02:00
* Close the released version
2015-12-07 16:29:19 +01:00
* Update Redmine filters for the next major/minor version