Use upstream Gerrit.war instead of building our own
Closed, ResolvedPublic
Actions

Assigned To

Authored By

	hashar
	Nov 17 2020, 1:42 PM

Description

We are building our own Gerrit.war using operations/software/gerrit , that comes from a time when we had a lot of cherry picks and were not closely following upstream releases.

The sole purpose for building our own fork is currently for a single cherry pick to bring a json library 185bdc3a69370c3ab96cc94d20c0746fe6bade56. If we can get rid of it, I am confident we can then simply reuse the upstream release.

They are released at https://gerrit-releases.storage.googleapis.com/index.html

Or as signed artifacts on Maven Central https://search.maven.org/#search%7Cga%7C1%7Cg%3A%22com.google.gerrit%22

Thus tentatively we could have a script that borrows the material from Maven Central, verify the signature and send it to our Archiva?

Related Objects
Search...

Status	Assigned	Task
Resolved	hashar	T268019 Use upstream Gerrit.war instead of building our own
Resolved	hashar	T268020 Remove jsonevent-layout library from our Gerrit fork
Resolved	hashar	T240264 Gerrit loads font from fonts.googleapis.com and fonts.gstatic.com
Resolved	hashar	T299451 Upgrade Gerrit from 3.3.6 to 3.3.9

Event Timeline

hashar created this task.Nov 17 2020, 1:42 PM

Restricted Application added a subscriber: Aklapper. · View Herald TranscriptNov 17 2020, 1:42 PM

hashar added a subtask: T240264: Gerrit loads font from fonts.googleapis.com and fonts.gstatic.com.Jan 28 2021, 3:58 PM

The summary is:

T268020 185bdc3a69370c3ab96cc94d20c0746fe6bade56 is to add net.logstash.log4j:jsonevent-layout:1.7 in the Gerrit.war. We use it for log formatting. I have made a patch to have the lib shipped at deployment time instead of via a wikimedia built .war
T240264 which is for plugins/gitiles it does not really prevent us from using the upstream gerrit.war as long as we keep overriding the shipped gitiles plugin with our own fork.

Aklapper changed the status of subtask T240264: Gerrit loads font from fonts.googleapis.com and fonts.gstatic.com from Open to Stalled.Jan 28 2021, 4:13 PM

hashar closed subtask T268020: Remove jsonevent-layout library from our Gerrit fork as Resolved.Feb 2 2021, 8:42 AM

hashar mentioned this in rGERRITDEPLOY5d6b0d693700: Merge tag 'v3.2.7' into wmf/stable-3.2.Feb 2 2021, 8:42 AM

With T268020 solved, we no more need to maintain our own fork and can just borrow upstream war file! What is left to do is to update https://wikitech.wikimedia.org/wiki/Gerrit :]

I have done some update to https://wikitech.wikimedia.org/wiki/Gerrit but need to continue. Notably how to retrieve the .jar from upstream and how to rebuild our plugin or borrow from upstream.

thcipriani edited projects, added Release-Engineering-Team (thcipriani-workboard-fiddling); removed Release-Engineering-Team (Development services).Apr 20 2021, 1:17 AM

thcipriani moved this task from thcipriani-workboard-fiddling to Seen (ARCHIVE) on the Release-Engineering-Team board.Apr 20 2021, 1:18 AM

thcipriani edited projects, added Release-Engineering-Team; removed Release-Engineering-Team (thcipriani-workboard-fiddling).

thcipriani edited projects, added Release-Engineering-Team (Seen); removed Release-Engineering-Team.Apr 20 2021, 3:23 PM

hashar changed the status of subtask T240264: Gerrit loads font from fonts.googleapis.com and fonts.gstatic.com from Stalled to Open.May 22 2021, 11:11 AM