- 1. Preparations
- 2. Version
- 3. Changelog
- 4. Git Tag
- 5. Package Builds
- 6. Build Server
- 7. Release Tests
- 8. GitHub Release
- 9. Docker
- 10. Post Release
Specify the release version.
VERSION=2.11.0Add your signing key to your Git configuration file, if not already there.
vim $HOME/.gitconfig
[user]
email = michael.friedrich@icinga.com
name = Michael Friedrich
signingkey = D14A1F16
Check issues at https://github.com/Icinga/icinga2
For minor versions you need to manually backports any and all commits from the master branch which should be part of this release.
Update the version:
perl -pi -e "s/Version: .*/Version: $VERSION/g" VERSIONChoose the most important issues and summarize them in multiple groups/paragraphs. Provide links to the mentioned issues/PRs. At the start include a link to the milestone's closed issues.
git commit -v -a -m "Release version $VERSION"Create a signed tag (tags/v) on the master branch (for major
releases) or the support branch (for minor releases).
git tag -s -m "Version $VERSION" v$VERSIONPush the tag:
git push origin v$VERSIONFor major releases: Create a new support branch:
git checkout master
git push
git checkout -b support/2.12
git push -u origin support/2.12mkdir $HOME/dev/icinga/packaging
cd $HOME/dev/icinga/packaginggit clone git@git.icinga.com:packaging/rpm-icinga2.git && cd rpm-icinga2git clone git@git.icinga.com:packaging/deb-icinga2.git && cd deb-icinga2git clone git@git.icinga.com:packaging/raspbian-icinga2.git && cd raspbian-icinga2git clone git@git.icinga.com:packaging/windows-icinga2.git && cd windows-icinga2For each support branch in this repo (e.g. support/2.12), there exists a corresponding branch in the packaging repos (e.g. 2.12). Each package revision is a tagged commit on these branches. When doing a major release, create the new branch, otherweise switch to the existing one.
Ensure that ICINGA_BUILD_TYPE is set to release in .gitlab-ci.yml. This should only be necessary after creating a
new branch.
variables:
...
ICINGA_BUILD_TYPE: release
...Commit the change.
git commit -av -m "Switch build type for 2.13"Set the Version, revision and %changelog inside the spec file:
perl -pi -e "s/Version:.*/Version: $VERSION/g" icinga2.spec
vim icinga2.spec
%changelog
* Thu Sep 19 2019 Michael Friedrich <michael.friedrich@icinga.com> 2.11.0-1
- Update to 2.11.0
Update file debian/changelog and add at the beginning:
icinga2 (2.11.0-1) icinga; urgency=medium
* Release 2.11.0
-- Michael Friedrich <michael.friedrich@icinga.com> Thu, 19 Sep 2019 10:50:31 +0200
Update the file .gitlab-ci.yml:
perl -pi -e "s/^ UPSTREAM_GIT_BRANCH: .*/ UPSTREAM_GIT_BRANCH: v$VERSION/g" .gitlab-ci.yml
perl -pi -e "s/^ ICINGA_FORCE_VERSION: .*/ ICINGA_FORCE_VERSION: v$VERSION/g" .gitlab-ci.yml
Commit the changes and push the branch.
git commit -av -m "Release $VERSION-1"
git push origin 2.11GitLab will now build snapshot packages based on the tag v2.11.0 of Icinga 2.
In order to test the created packages you can download a job's artifacts:
Visit git.icinga.com
and navigate to the respective pipeline under CI / CD -> Pipelines.
There click on the job you want to download packages from.
The job's output appears. On the right-hand sidebar you can browse its artifacts.
Once there, navigate to build/RPMS/noarch where you'll find the packages.
To build release packages and upload them to packages.icinga.com tag the release commit and push it.
RPM/DEB/Raspbian:
git tag -s $VERSION-1 -m "Release v$VERSION-1"
git push origin $VERSION-1Windows:
git tag -s $VERSION -m "Release v$VERSION"
git push origin $VERSIONNow cherry pick the release commit to master so that the changes are transferred back to it.
Attention: Only the release commit. NOT the one switching the build type!
https://git.icinga.com/packaging/rpm-icinga2/pipelines https://git.icinga.com/packaging/deb-icinga2/pipelines https://git.icinga.com/packaging/windows-icinga2/pipelines https://git.icinga.com/packaging/raspbian-icinga2/pipelines
- Verify package build changes for this version.
- Test the snapshot packages for all distributions beforehand.
Once the release repository tags are pushed, release builds are triggered and automatically published to packages.icinga.com
- Test DB IDO with MySQL and PostgreSQL.
- Provision the vagrant boxes and test the release packages.
- Test the setup wizard inside a Windows VM.
- Start a new docker container and install/run icinga2.
docker run -ti centos:7 bash
yum -y install https://packages.icinga.com/epel/icinga-rpm-release-7-latest.noarch.rpm
yum -y install epel-release
yum -y install icinga2
icinga2 daemon -Cdocker run -ti ubuntu:bionic bash
apt-get update
apt-get -y install apt-transport-https wget gnupg
wget -O - https://packages.icinga.com/icinga.key | apt-key add -
. /etc/os-release; if [ ! -z ${UBUNTU_CODENAME+x} ]; then DIST="${UBUNTU_CODENAME}"; else DIST="$(lsb_release -c| awk '{print $2}')"; fi; \
echo "deb https://packages.icinga.com/ubuntu icinga-${DIST} main" > \
/etc/apt/sources.list.d/${DIST}-icinga.list
echo "deb-src https://packages.icinga.com/ubuntu icinga-${DIST} main" >> \
/etc/apt/sources.list.d/${DIST}-icinga.list
apt-get update
apt-get -y install icinga2
icinga2 daemon -CCreate a new release for the newly created Git tag: https://github.com/Icinga/icinga2/releases
Hint: Choose 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.
Only for final versions (not for RCs).
Once the release has been published on GitHub, wait for its GitHub actions to complete.
VERSION=2.12.1
TAGS=(2.12)
#TAGS=(2.12 2 latest)
docker pull icinga/icinga2:$VERSION
for t in "${TAGS[@]}"; do
docker tag icinga/icinga2:$VERSION icinga/icinga2:$t
done
for t in "${TAGS[@]}"; do
docker push icinga/icinga2:$t
doneOnly required for major releases.
Navigate to puppet-customer/icinga.git and do the following steps:
git checkout testing && git pull
vim files/var/www/docs/config/icinga2-latest.yml
git commit -av -m "icinga-web: Update docs for Icinga 2"
git pushSSH into the webserver and do a manual Puppet dry run with the testing environment.
puppet agent -t --environment testing --noopOnce succeeded, continue with production deployment.
git checkout master && git pull
git merge testing
git pushSSH into the webserver and do a manual Puppet run from the production environment (default).
puppet agent -tSSH into the webserver or ask @bobapple.
cd /usr/local/icinga-docs-tools && ./build-docs.rb -c /var/www/docs/config/icinga2-latest.yml- Create a new blog post on icinga.com/blog including a featured image
- Create a release topic on community.icinga.com
- Release email to net-tech & team
- Add new minor version on GitHub.