From 0d70aa2bb4d62265ccb62e57b8b4b04e8cd82c3d Mon Sep 17 00:00:00 2001 From: Michael Friedrich Date: Fri, 26 Apr 2019 09:47:20 +0200 Subject: [PATCH 1/2] Update release docs --- RELEASE.md | 88 ++++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 72 insertions(+), 16 deletions(-) diff --git a/RELEASE.md b/RELEASE.md index c7ab6497c..23404ad9c 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -25,7 +25,7 @@ Specify the release version. ``` -VERSION=2.6.0 +VERSION=2.6.3 ``` Add your signing key to your Git configuration file, if not already there. @@ -136,8 +136,8 @@ sed -i "s/Version: .*/Version: $VERSION/g" icingaweb2.spec vim icingaweb2.spec %changelog -* Fri Apr 27 2018 Eric.Lippmann 2.5.3-1 -- Update to 2.5.3 +* Wed Apr 24 2019 Johannes Meyer 2.6.3-1 +- Update to 2.6.3 ``` ``` @@ -174,37 +174,47 @@ git checkout release && git pull #### Release Commit -Set the `Version`, `Revision` and `changelog` inside the spec file. +Set the `Version`, `Revision` and `changelog` by using the `dch` helper. ``` -./dch 2.5.3-1 "Update to 2.5.3" +VERSION=2.6.3 + +./dch $VERSION-1 "Update to $VERSION" ``` ``` -git commit -av -m "Release 2.5.3-1" +git commit -av -m "Release $VERSION-1" git push ``` + **Note for major releases**: Update release branch to latest. -`git checkout release && git pull && git merge master && git push` + +``` +git checkout release && git pull && git merge master && git push +``` **Note for minor releases**: Cherry-pick the release commit into master. -`git checkout master && git pull && git cherry-pick release && git push` + +``` +git checkout master && git pull && git cherry-pick release && git push +``` #### DEB with dch on macOS ``` -docker run -v `pwd`:/mnt/packaging -ti ubuntu:xenial bash +docker run -v `pwd`:/mnt/packaging -ti ubuntu:bionic bash -apt-get update -apt-get install git devscripts vim +apt-get update && apt-get install git ubuntu-dev-tools vim -y cd /mnt/packaging git config --global user.name "Eric Lippmann" git config --global user.email "eric.lippmann@icinga.com" -./dch 2.5.3-1 "Update to 2.5.3" +VERSION=2.6.3 + +./dch $VERSION-1 "Update to $VERSION" ``` ## Build Server @@ -212,24 +222,70 @@ git config --global user.email "eric.lippmann@icinga.com" * 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. + * Wait until all jobs have passed and then publish them one by one with `allow_release` ## Release Tests * Provision the vagrant boxes and test the release packages. +* * Start a new docker container and install/run Icinga Web 2 & icingacli. + +### CentOS + +``` +docker run -ti centos:latest bash + +yum -y install https://packages.icinga.com/epel/icinga-rpm-release-7-latest.noarch.rpm +yum -y install centos-release-scl +yum -y install icingaweb2 icingacli +icingacli +``` + +### Debian + +``` +docker run -ti debian:stretch bash + +apt-get update && apt-get install -y wget curl gnupg apt-transport-https + +DIST=$(awk -F"[)(]+" '/VERSION=/ {print $2}' /etc/os-release); \ + echo "deb https://packages.icinga.com/debian icinga-${DIST} main" > \ + /etc/apt/sources.list.d/${DIST}-icinga.list + echo "deb-src https://packages.icinga.com/debian icinga-${DIST} main" >> \ + /etc/apt/sources.list.d/${DIST}-icinga.list + +curl https://packages.icinga.com/icinga.key | apt-key add - +apt-get -y install icingaweb2 icingacli +icingacli +``` + ## GitHub Release Create a new release for the newly created Git tag: https://github.com/Icinga/icingaweb2/releases +> Hint: Choose [tags](https://github.com/Icinga/icingaweb2/tags), pick one to edit and +> make this a release. You can also create a draft release. + +The release body should contain a short changelog, with links +into the roadmap, changelog and blogpost. + ### Online Documentation -Ask @bobapple to update the documentation at docs.icinga.com. +This is built with a daily cronjob. + +#### Manual Updates + +SSH into the webserver or ask @bobapple. + +``` +cd /usr/local/icinga-docs-tools && ./build-docs.rb -c /var/www/docs/config/icingaweb2-latest.yml +``` ### Announcement -* Create a new blog post on icinga.com/blog -* Social media: [Twitter](https://twitter.com/icinga), [Facebook](https://www.facebook.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 +* Create a new blog post on [icinga.com/blog](https://icinga.com/blog) including a featured image +* Create a release topic on [community.icinga.com](https://community.icinga.com) +* Release email to net-tech & team ### Project Management From 9ab4db6182e28d379ae423dd1528c28dc66e5791 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Mon, 6 May 2019 12:52:30 +0200 Subject: [PATCH 2/2] RELEASE.md: Correct a few mistakes --- RELEASE.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/RELEASE.md b/RELEASE.md index 23404ad9c..bb03c2f06 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -46,7 +46,7 @@ Check issues at https://github.com/Icinga/icingaweb2 ### Backport Commits For minor versions not branched off git master you need -to manually backports any and all commits from the +to manually backport any and all commits from the master branch which should be part of this release. ### Authors @@ -69,8 +69,8 @@ Commands: ``` echo "v$VERSION" > VERSION -sed -i '' "s/const VERSION = '.*'/const VERSION = '$VERSION'/g" library/Icinga/Application/Version.php -find . -type f -name '*.info' -exec sed -i '' "s/Version: .*/Version: $VERSION/g" {} \; +sed -i "s/const VERSION = '.*'/const VERSION = '$VERSION'/g" library/Icinga/Application/Version.php +find . -type f -name '*.info' -exec sed -i "s/Version: .*/Version: $VERSION/g" {} \; ``` ## Changelog @@ -141,7 +141,7 @@ vim icingaweb2.spec ``` ``` -git commit -av -m "Release 2.5.3-1" +git commit -av -m "Release $VERSION-1" git push ``` @@ -275,7 +275,7 @@ This is built with a daily cronjob. #### Manual Updates -SSH into the webserver or ask @bobapple. +SSH into the webserver or ask [bobapple](https://github.com/bobapple). ``` cd /usr/local/icinga-docs-tools && ./build-docs.rb -c /var/www/docs/config/icingaweb2-latest.yml