From c5c3e6e575ddf3fd529ab2adc4ee063c61dbd193 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Fri, 13 Jan 2023 10:32:08 -0800
Subject: [PATCH] Fix Gerrit 3.6 image build
This checks out master of the reviewnotes plugin which includes fixes
for flogger compile time log string checks brought in by a recent Bazel
update. Unfortauntely no 3.6.x tag includes these fixes yet. Judging by
the change log this should be safe though.
Change-Id: I71d4e7732a49236af9f8f558743c19f3dad9818e
---
zuul.d/docker-images/gerrit.yaml | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/zuul.d/docker-images/gerrit.yaml b/zuul.d/docker-images/gerrit.yaml
index d33b15b8fa..8a9f000e03 100644
--- a/zuul.d/docker-images/gerrit.yaml
+++ b/zuul.d/docker-images/gerrit.yaml
@@ -73,7 +73,10 @@
- name: gerrit.googlesource.com/plugins/replication
override-checkout: v3.6.3
- name: gerrit.googlesource.com/plugins/reviewnotes
- override-checkout: v3.6.3
+ # Temporarily checkout master to include FloggerLogString
+ # build error fixes. These errors have started due to a
+ # recent Bazel update
+ override-checkout: master
- name: gerrit.googlesource.com/plugins/singleusergroup
override-checkout: v3.6.3
- name: gerrit.googlesource.com/plugins/webhooks