Page MenuHomePhabricator

Update gerrit to 2.15.3
Closed, ResolvedPublic

Description

2.15.3 is now released (https://gerrit-review.googlesource.com/c/gerrit/+/185671) (https://groups.google.com/forum/#!topic/repo-discuss/jDu-3oysoCU)

Bug fixes that are important are:

  • "Fix file handle leak when running GC."
    • This could cause gerrit to fail one day without warning without this fix.
  • Allows project admins to set a change as WIP or mark a change as ready for review.
    • Currently only admins can do this. With 2.15.3 project owners can now do this. This will partially resolve. T197238 even though the button was there. Only admins were able to help.
  • Alot of fixes for internal errors.

278 commits since 2.15.2 (https://github.com/GerritCodeReview/gerrit/compare/v2.15.2...stable-2.15)

Elasticsearch 5 and 6 are now supported but not yet recommended for production use yet.

See release notes at https://gerrit.googlesource.com/homepage/+/md-pages/releases/2.15.md#2.15.3

Details

Event Timeline

thcipriani triaged this task as Medium priority.Jul 18 2018, 2:16 PM

Changelog looks like a lot of small fixes which might make a good introduction to the process for Release-Engineering-Team.

This is mostly documented on wikitech, but I'll provide a few more in depth pointers here. Luckily there's no schema changes on this release so you can skip the init steps.

@thcipriani not sure if anyone told you the process.

process is

  1. merge upstream into https://gerrit.wikimedia.org/g/operations/software/gerrit/+/refs/heads/stable-2.15

Shouldn't be a merge, just pulling from upstream then pushing to this ref should be a fast-forward always (it tracks upstream with zero modifications). If you skip this step, the next one thinks you want to push dozens of commits for review :P

  1. then merge into https://gerrit.wikimedia.org/r/plugins/gitiles/operations/software/gerrit/+/wmf/stable-2.15

Specifically, merge the tag we want to deploy into that branch. In this case: git merge v2.15.3. Push the resulting merge commit for review. If it looks like you're pushing more than that, then step (1) went sideways. Also, for all non-core plugins I go ahead and update the to the tip of their stable-2.15 branch (or master, for those that lack it). Push that change to wmf/stable-2.15 as well.

then upload to archival (not sure how) hints are in https://gerrit.wikimedia.org/r/plugins/gitiles/operations/software/gerrit/+/deploy/wmf/stable-2.15 i guess.

then update the files in https://gerrit.wikimedia.org/r/plugins/gitiles/operations/software/gerrit/+/deploy/wmf/stable-2.15

Before this, you need to build Gerrit from the wmf/stable-2.15 branch. Install openjdk-8 and bazel. The build command we want here is bazel build release (release includes the built-in docs, all plugins, etc). Copy the release.war to gerrit.war. The plugin jars can be found by unzipping the war file or in bazel-out/ (I think. It might be bazel-gen/. You can upload them manually to Archiva (a pain) or you can use deploy_artifacts.py on that branch. I prefer the latter. Credentials can be found in the Releng secrets repository or obtained from ops. Make sure you run git fat init since we don't want to commit the actual jar files, then commit, push, and do a normal scap deploy from /srv/deployment/gerrit/gerrit. Oh, and restart the service since we don't have scap auto-restart for us.

Ping me on IRC when you're doing this, I can be around to help you in case you have issues.

Ping me on IRC when you're doing this, I can be around to help you in case you have issues.

Scheduled for this afternoon https://wikitech.wikimedia.org/wiki/Deployments#deploycal-item-20180726T1900

@Dzahn agreed to help us out in case we need additional root help.

Change 448063 had a related patch set uploaded (by Thcipriani; owner: Thcipriani):
[operations/software/gerrit@deploy/wmf/stable-2.15] Gerrit 2.15.3 release

https://gerrit.wikimedia.org/r/448063

Change 448063 merged by Dzahn:
[operations/software/gerrit@deploy/wmf/stable-2.15] Gerrit 2.15.3 release

https://gerrit.wikimedia.org/r/448063