Release 10.2.5
-
Schedule the patch release by setting a Due date -
Create preparation MRs by following the instructions in release-tools. -
Cherry-pick changes into preparation MRs following their instructions -
Cherry-pick remaining merge requests labeled ~"Pick into 10.2" using this Merged MRs list -
Check the following list of critical issues/MRs which are to be included in 10.2.5. Where appropriate, ensure each has made it into both CE and EE -
Make sure the Due date is up-to-date -
EE conflicts have been double checked by authors https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3774#note_51469694 -
Merge https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15925 -
Merge https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3774 -
If you didn't merge CE into EE in the preparation branches, or if the CE stable branch had additional commits, merge CE10-2-stableinto EE10-2-stable-eefollowing the Merging a CE stable branch into its EE counterpart guide. (In general this is unnecessary for CE and EE) -
Ensure builds are green on Omnibus CE stable branch and Omnibus EE stable branch -
Sync stable branches: CE, EE, and Omnibus to dev, CE and Omnibus togithub -
Sync master branches to devandgithub, as the CHANGELOG will be automatically updated on master during tagging -
If needed, sync tags for dependencies ( gitlab-shell,gitlab-workhorse,gitlab-pages,gitaly) todevandgithub(when applicable. Builds should fail if this is needed.)- I don't know if it was needed, but I checked them all, and
gitlab-shellhad 3 tags not on github so I pushed them
- I don't know if it was needed, but I checked them all, and
-
Check for any problematic migrations in EE (EE migrations include CE ones), and paste the diff in a snippet: git diff v10.2.4-ee..10-2-stable-ee -- db/migrate db/post_migrate=> https://gitlab.com/snippets/1689077 -
In #releases: I'm going to tag10.2.5 -
Tag the 10.2.5version using thereleasetask:```sh # In the release-tools project: bundle exec rake "release[10.2.5]" ``` -
While waiting for packages to build, now is a good time to create the blog post MR. Look at previous MRs for examples. => gitlab-com/www-gitlab-com!9014 (merged) -
Check progress of EE packages build and CE packages build -
Install 10.2.5 to your own VM anywhere you are able-- preferably somewhere QA can check it out => http://35.193.73.86/ -
Notify QA about where to go to test on 10.2.5? -
Run automated QA? => https://gitlab.com/gitlab-org/gitlab-ce/snippets/1689487 -
Smoke test -
No canary or prod deploy because 10.3 is going out -
Create the 10.2.5version on https://version.gitlab.com -
Deploy the blog post -
Tweet (prepare the Tweet text below or paste the tweet URL instead) in the #releaseschannel:``` !tweet "GitLab 10.2.5 is released! https://about.gitlab.com/2017/12/18/gitlab-10-2-5-released/" ``` -
Add omnibus-gitlab/10.2.5+ce.0CHANGELOG.md items toomnibus-gitlab/masterCHANGELOG.md
For references:
On gitlab.com
- https://gitlab.com/gitlab-org/gitlab-ce/commits/10-2-stable
- https://gitlab.com/gitlab-org/gitlab-ee/commits/10-2-stable-ee
- https://gitlab.com/gitlab-org/omnibus-gitlab/commits/10-2-stable
- https://gitlab.com/gitlab-org/omnibus-gitlab/commits/10-2-stable-ee
On gitlab.org