Project

General

Profile

Release Process » History » Version 139

Dominic Cleal, 09/15/2015 10:16 AM
cherry picking

1 1 Dominic Cleal
h1. Release Process
2
3 134 Dominic Cleal
For each major release (i.e. not patch releases), the project selects a release manager who's responsible for taking the develop branch through to release.
4 1 Dominic Cleal
5
Please amend these lists as you see free, and as you find what works and what doesn't work.
6
7 51 Lukas Zapletal
h2. First steps
8 1 Dominic Cleal
9 132 Dominic Cleal
# Select the release manager
10 2 Dominic Cleal
# Ensure RPM and Debian nightly packages are in good shape and all RPM dependencies are up to date
11 7 Dominic Cleal
# Ensure "Transifex project":https://www.transifex.com/projects/p/foreman/ is up to date
12 1 Dominic Cleal
# Decide on the version number
13 2 Dominic Cleal
# If number has changed, update version number in redmine
14 94 Dominic Cleal
# Add _next+1_ anticipated version number to redmine under "Releases":http://projects.theforeman.org/rb/releases/foreman, sharing "With subprojects"
15 51 Lukas Zapletal
16 132 Dominic Cleal
h2. Near-end of development phase
17 51 Lukas Zapletal
18 1 Dominic Cleal
# Announce beginning of bug-squashing to foreman-dev ("example":http://groups.google.com/group/foreman-dev/browse_thread/thread/769d9060774da864)
19
# Copy website manual content ("theforeman.org repo":http://github.com/theforeman/theforeman.org) from previous version to this version ("example":https://github.com/theforeman/theforeman.org/pull/43)
20 132 Dominic Cleal
#* add version number to documentation.md dropdown menu
21 126 Dominic Cleal
# Change @$latest@ and @$next@ parameters on @web@ class to point to the new version numbers (see @foreman-infra/puppet/modules/web/manifests/init.pp@)
22 8 Dominic Cleal
# Update manual if applicable for any additional installation steps
23 58 Lukas Zapletal
# Draft release notes in markdown ("example":https://gist.github.com/domcleal/5567450) using roadmap, with these sections (and do not use personal pronouns):
24 6 Dominic Cleal
## Headline features: half a dozen important features with a few sentences description each
25
## Upgrade notes: all important notices that users must be aware of before upgrading
26 64 Lukas Zapletal
## Release notes: bullet point list by category of most changes, excluding bug fixes for issues introduced during the release cycle, include link to bug numbers (helper vim search and replace command bellow)
27 112 Dominic Cleal
## CLI release notes are taken from the hammer-cli and hammer-cli-foreman changelogs
28
## Link to installer changelogs and note the rough versions being used
29 60 Lukas Zapletal
# Check @git log@ for any changes without associated bug number and add to release notes if applicable (https://gist.github.com/lzap/6520535)
30 1 Dominic Cleal
# Refresh unattended templates from the community-templates to Foreman core, by running @script/sync_templates.sh@
31
# Create a new branch in community-templates for upcoming Foreman release (e.g. 1.2-stable)
32 132 Dominic Cleal
# Generate a release GPG key using [[GPG_Keys]]
33
#* publish to keyserver
34
#* security.md on the website
35
#* create @releases/1.2/RPM-GPG-KEY-foreman@ on yum.theforeman.org
36 117 Dominic Cleal
# Clone tags and create build targets in "Koji":http://koji.katello.org/koji using koji/copy-tags-commands.sh in foreman-packaging/rpm/develop
37 55 Lukas Zapletal
#* foreman-1.2-rhel6 etc. as clones of nightly tags
38 107 Dominic Cleal
#* foreman-plugins-1.2-rhel6 etc. with inheritance from the new Foreman tags
39
#* Untag all git/nightly builds: @for t in foreman-1.2-rhel6 foreman-1.2-nonscl-rhel6 foreman-1.2-rhel7 foreman-1.2-nonscl-rhel7 foreman-1.2-fedora19; do kkoji list-tagged $t  | grep git | awk '{print $1}' | xargs kkoji untag-build  $t; done@
40 136 Dominic Cleal
#* check for non-SCL packages that might be in the SCL tags and untag them, else these will cause mash precedence issues.  This should be fixed now for 1.10, please remove this step when confirmed.
41 111 Dominic Cleal
# Create mash scripts and configuration on Koji
42
#* copy /usr/local/bin/foreman-mash-split-1.*.py to foreman-mash-split-1.2.py, update the OSes and version numbers at the bottom
43 132 Dominic Cleal
#* copy /etc/mash/foreman-1.*-*.mash and foreman-plugins-1.*-*.mash, update the version numbers, add/remove files for OS changes, set GPG key ID
44 124 Dominic Cleal
# Add new plugin tags (i.e. 1.2) to Koji plugins mash script (foreman-mash-split-plugins.py), remove old ones (keep three)
45 121 Dominic Cleal
# Add version (1.2) to "release_plugins_push":http://ci.theforeman.org/view/Release%20jobs/job/release_plugins_push job (note, it will be added to tests later), remove old ones (keep three)
46 110 Dominic Cleal
# Clone Debian nightly repos to 1.2 using "copy/freight instructions":http://projects.theforeman.org/projects/foreman/wiki/Debian_Packaging#Project-sources
47 64 Lukas Zapletal
# Add release to "Found in release" list in redmine: http://projects.theforeman.org/custom_fields/4/edit
48
49 1 Dominic Cleal
Helper vim command to replace all @(#1234)@ bugs with links:
50 64 Lukas Zapletal
51
    %s/(\(#\)\([0-9]\+\))/(\[\1\2]\(http:\/\/projects.theforeman.org\/issues\/\2))/g
52 1 Dominic Cleal
53 132 Dominic Cleal
h2. Branching for release
54 8 Dominic Cleal
55 115 Dominic Cleal
When ready to branch for release candidates.
56 1 Dominic Cleal
57 40 Dominic Cleal
# Make releases of installer modules, usually new minor or major versions
58 61 Lukas Zapletal
# Add new languages that are at a reasonable completion on Transifex to *develop*
59 1 Dominic Cleal
# In foreman *develop* run @make -C locale tx-update@
60
# In foreman, smart-proxy, foreman-installer and foreman-selinux branch *develop* to *1.2-stable* (*from this point* cherry-picks into this branch only from this point using: @git cherry-pick -x SHA@)
61 132 Dominic Cleal
# In foreman-installer, branch *1.2-stable*,
62 1 Dominic Cleal
## change Puppetfile from git references to specific version ranges (e.g. @>= 1.3.1 < 1.4.0@)
63
# In foreman-packaging for RPMs:
64 70 Dominic Cleal
## branch *rpm/develop* to *rpm/1.2*
65 132 Dominic Cleal
## on *rpm/1.2*
66
### in rel-eng/releasers.conf and rel-eng/tito.props, replace "nightly" with "1.2"
67
### change @foreman/foreman.repo@ URLs from @/nightly@ to @/releases/1.2@, change "nightly" in name to "1.2" and enable gpg checking
68
### change @foreman/foreman-plugins.repo@ URLs from @/plugins/nightly@ to @/plugins/1.2@, change "nightly" in name to "1.2" and DO NOT enable GPG checking
69
### update @foreman/foreman.gpg@ with the release public key
70 127 Dominic Cleal
## on *rpm/develop*
71
### change foreman/foreman-proxy/foreman-installer/foreman-selinux version to 1.3.0, add %changelog entry
72
### change tag_suffix to @.fm1_3@ in rel-eng/tito.props
73 122 Dominic Cleal
# In foreman-packaging for debs:
74
## on *deb/develop*, update debian/*/*/changelog with entries from 1.1, commit with message "Sync 1.1.x releases into changelogs"
75
## branch *deb/develop* to *deb/1.2*
76
## on *deb/develop*, run @scripts/changelog.rb -v 1.3.0-1 -m "Bump changelog to 1.3.0 to match VERSION" debian/*/*/changelog@
77 1 Dominic Cleal
# In foreman *develop* commit with message "Bump version to 1.3-develop":
78 100 Dominic Cleal
## change to VERSION to 1.3.0-develop
79 106 Dominic Cleal
## run @extras/changelog@
80 100 Dominic Cleal
# In smart-proxy *develop* commit with message "Bump version to 1.3-develop":
81
## change to VERSION to 1.3.0-develop
82 1 Dominic Cleal
## run @extra/changelog@
83 52 Dominic Cleal
# In foreman-selinux *develop* commit with message "Bump version to 1.3-develop":
84 1 Dominic Cleal
## change to VERSION to 1.3.0-develop
85
## run @extras/changelog@
86
# In foreman-installer *develop* commit with message "Bump version to 1.3-develop":
87
## change to VERSION to 1.3.0-develop
88 101 Dominic Cleal
# Update foreman-dev with "translations status":https://www.transifex.com/projects/p/foreman/ to encourage 100% translations before release, announce string freeze date
89 1 Dominic Cleal
# Change Transifex resource URL to point to the 1.2-stable branch
90 102 Dominic Cleal
# Set up test_1_2_stable job on Jenkins, copy from existing stable or test_develop (don't use dots in the name, it breaks)
91 1 Dominic Cleal
# Set up test_proxy_1_2_stable job on Jenkins in the same way
92
# Update release notes in new website manual version
93 103 Dominic Cleal
94 132 Dominic Cleal
h2. Tagging a release
95 1 Dominic Cleal
96 132 Dominic Cleal
Version numbers for release candidates start with "1.2.0-RC1" (always hyphenated).  The first release after RC would be "1.2.0".  Change examples below as appropriate.
97
98 1 Dominic Cleal
# Make patch releases of installer modules that have important changes
99 132 Dominic Cleal
#* Branch to MAJ.MIN-stable if recent changes to the module aren't suitable for patch (x.y.z) release
100 1 Dominic Cleal
# Compare tagged packages in nightly vs. release koji tag and re-tag any updated dependencies that are required
101 139 Dominic Cleal
# Remove/change release field for any open Redmine tickets assigned to the release still
102
# List all issues targeted at the release, order by Closed date ascending and use @git cherry-pick -x@ to cherry pick from develop to *1.2-stable* branch
103
# Clone "tool_belt":https://github.com/theforeman/tool_belt (foreman branch) and run:
104
## @./tools.rb setup-environment configs/foreman_12.yaml@
105
## @./tools.rb cherry-picks --version 1.2.0 configs/foreman_12.yaml@
106
## Verify tickets in the @cherry_picks_1.2.0@ file are accounted for or additional cherry pick them
107 1 Dominic Cleal
# In foreman *1.2-stable* run:
108
## @make -C locale tx-update@
109
## @script/sync_templates.sh@
110
# In foreman *1.2-stable* commit with message "Release 1.2.0":
111
## change VERSION to 1.2.0
112
## run @extras/changelog@
113 104 Dominic Cleal
# In smart-proxy *1.2-stable* commit with message "Release 1.2.0":
114
## change VERSION to 1.2.0
115 1 Dominic Cleal
## run @extra/changelog@
116 115 Dominic Cleal
# In foreman-selinux *1.2-stable* commit with message "Release 1.2.0":
117 109 Dominic Cleal
## change VERSION to 1.2.0
118 1 Dominic Cleal
## run extras/changelog
119
# In foreman-installer *1.2-stable* commit with message "Release 1.2.0":
120 115 Dominic Cleal
## change VERSION to 1.2.0
121
# Tag commits in foreman, smart-proxy, foreman-installer and foreman-selinux: @git tag -m "Release 1.2.0" 1.2.0@
122 52 Dominic Cleal
# Push to the project repos: @git push project && git push project 1.2.0@
123 1 Dominic Cleal
# Run the Jenkins "Release Pipeline":http://ci.theforeman.org/view/Release%20pipeline/ to create tarballs
124
# Verify tarballs are present on downloads.theforeman.org, download, sign and upload detached signatures
125 115 Dominic Cleal
## @gpg --homedir gnupg/1.2 -b -u packages@theforeman.org foreman-1.2.0.tar.bz2@ (requires 1.2 release GPG key generated above)
126 132 Dominic Cleal
127
h2. Packaging a release
128
129 1 Dominic Cleal
# In foreman-packaging rpm/1.2 branch, change foreman.spec, foreman-proxy.spec, foreman-selinux.spec, foreman-installer.spec:
130 132 Dominic Cleal
## set version to "1.2.0"
131
## For RCs: set release to "0.1%{?dotalpha....", uncomment alphatag* (replace # with %), change to RC1
132
## For non-RCs: set release to "1%{?dotalpha....", comment alphatag* (replace % with #)
133 52 Dominic Cleal
## in each package dir, run @spectool -g *.spec@ and @git annex add *.tar.bz2@
134 115 Dominic Cleal
## commit with message "Release 1.2.0"
135 1 Dominic Cleal
## perform RPM scratch build of each project (see [[RPM_Packaging]])
136 115 Dominic Cleal
## tag each project with @tito tag --keep-version --auto-changelog-message "Release 1.2.0"@
137 132 Dominic Cleal
# [[Debian_Packaging#foreman]]: Update changelog files
138
## @scripts/changelog.rb -v 1.2.0-1 -m "1.2.0 released" debian/*/*/changelog@
139 115 Dominic Cleal
# Trigger next step of release pipeline: @release_packages@
140 132 Dominic Cleal
# Use [[RPM_Packaging]] to sign RPMs
141
# Trigger next step of release pipeline: @release_mash@
142
# Trigger next step of release pipeline: @release_test@
143
# Trigger next step of release pipeline: @release_push_deb@ and @release_push_rpm@
144 115 Dominic Cleal
# Update theforeman.org sections:
145 138 Dominic Cleal
## @_includes/version.html@
146 132 Dominic Cleal
## @_includes/latest_news.html@ entry
147 115 Dominic Cleal
148 132 Dominic Cleal
h2. Completion tasks
149 41 Dominic Cleal
150 132 Dominic Cleal
If releasing the first non-RC release (i.e. 1.2.0), start with:
151
# update @$stable@ class parameter on @web@ class to point to the new version number (see @foreman-infra/puppet/modules/web/manifests/init.pp@)
152 137 Dominic Cleal
# deb.theforeman.org, changing stable:
153
## change web's /var/www/freight/apt/*/stable symlinks to the new version number
154
## @rm -rf /var/www/vhosts/deb/htdocs/pool/*/stable/@
155
## re-run freight cache
156 132 Dominic Cleal
# Update theforeman.org:
157
## @documentation.md@ change default version
158
## @_config.yml@ quickstart link
159
## @_layouts/manual.html@ latestversion
160
## @_layouts/homepage.html@ quickstart link
161
162
If releasing the first release candidate (i.e. RC1), start with:
163
164
# add version (1.2) to "release_plugins_test":http://ci.theforeman.org/job/release_plugins_test/ job
165
166
For all releases:
167
168 1 Dominic Cleal
# Send announcement e-mail to foreman-announce, CC foreman-users, set reply-to to foreman-users
169 72 Lukas Zapletal
# Link to announcement e-mail on IRC, Google+ and update IRC /topic
170 84 Dominic Cleal
# Add release to "Found in release" list in redmine: http://projects.theforeman.org/custom_fields/4/edit
171 132 Dominic Cleal
# Final only: Update Wikipedia Foreman entry at: https://en.wikipedia.org/wiki/Foreman_(software)
172 40 Dominic Cleal
173
h2. After final release
174 115 Dominic Cleal
175 49 Dominic Cleal
# Sync translations from Transifex into *develop* and update i18n
176 1 Dominic Cleal
# Remove target version from all issues assigned to the current release, unless they will be fixed in a future point release