devtools/gerrit: backport reviewiers column fix to 3.3.2
Gerrit 3.3.1 seems to have introduced a bug which makes the reviewers
column in the dashboard entry: https://bugs.chromium.org/p/gerrit/issues/detail?id=13899
This adds an override of gerrit.war to our Docker containers. The .war
is pulled over HTTP. It has been manually built by q3k from a source
checkout. The details on how this was done are in the WORKSPACE
http_file archive.
Once 3.3.3 lands we should get rid of it.
Change-Id: I8b64103cb87d8b185ff35165695a18cb19fea523
diff --git a/WORKSPACE b/WORKSPACE
index a23c9c0..fb81739 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,7 +3,7 @@
)
load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive", "http_file")
# Protobuf deps (shared between many rules).
# Load this as early as possible, to avoid a different version being pulled in by deps of something else
@@ -166,6 +166,26 @@
load("//devtools/gerrit/gerrit-oauth-provider:external_plugin_deps.bzl", gerrit_oauth_deps="external_plugin_deps")
gerrit_oauth_deps(omit_commons_codec=False)
+# Gerrit 3.3.2 built by q3k, backported with fix for 'empty reviewers column' bug.
+# See: https://bugs.chromium.org/p/gerrit/issues/detail?id=13899
+# Override can be removed once we update to > 3.3.2, as the fix for this is
+# pending for the 3.3 branch.
+#
+# Built from v3.3.2 tag at df0507df5917fd78af01aee2495b2663530d52d1
+# Cherry-picked fix from 8731af3ae785efe9ecff7f3d04302b6b01c4fc0b
+# Resulted in commit 5949bfb86e62a32a95293e339ed86bfe52a283e9
+# Built against Java 8:
+# bazel build --java_toolchain //tools:error_prone_warnings_toolchain :release
+#
+http_file(
+ name = "org_q3k_gerrit_3_3_2_backport",
+ urls = [
+ "https://object.ceph-waw3.hswaw.net/q3k-personal/d1839d691a8534f4ccb27bed9a98281e45972fbebec50d004cecd4d5da2b15a6.war",
+ ],
+ downloaded_file_path = "gerrit.war",
+ sha256 = "d1839d691a8534f4ccb27bed9a98281e45972fbebec50d004cecd4d5da2b15a6",
+)
+
# minecraft spigot/bukkit deps
# this uses rules_jvm_external vs gerrit's maven_jar because we need SNAPSHOT support