From 819d3ce4804b7bf91f27357bf72004dd351cf2d2 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Wed, 25 May 2022 08:37:33 -0700
Subject: [PATCH] Update Gerrit images to 3.4.5 and 3.5.2

3.4.5 is a fairly minor update. Some bugs are fixed and jgit is updated.

3.4.5 release notes:
  https://www.gerritcodereview.com/3.4.html#345

3.5.2 is a bigger update and important adds support for being able to
upgrade to 3.6.0 later. There is a new copy-approvals command that must
be run offline on 3.5.2 before upgrading to 3.6.0. This copies approvals
in the notedb in a way that 3.6.0 can handle them apparently. The
release notes indicate this may take some time to run. We don't need to
run it now though and instead need to make note of it when we prepare
for the 3.6.0 upgrade.

3.5.2 release notes:
  https://www.gerritcodereview.com/3.5.html#352

For now don't overthink things and instead just get up to date with our
images.

Change-Id: I837c2cbb09e9a4ff934973f6fc115142d459ae0f
---
 docker/gerrit/base/Dockerfile    |  2 +-
 zuul.d/docker-images/gerrit.yaml | 30 +++++++++++++++---------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/docker/gerrit/base/Dockerfile b/docker/gerrit/base/Dockerfile
index 2daaa19a8a..2a756fdb03 100644
--- a/docker/gerrit/base/Dockerfile
+++ b/docker/gerrit/base/Dockerfile
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Mon Apr 25 18:14:15 UTC 2022 - trigger rebuild
+# Wed May 25 15:37:12 UTC 2022 - trigger rebuild
 
 FROM docker.io/opendevorg/python-builder:3.9-bullseye as builder
 
diff --git a/zuul.d/docker-images/gerrit.yaml b/zuul.d/docker-images/gerrit.yaml
index e7d5ace574..656c790742 100644
--- a/zuul.d/docker-images/gerrit.yaml
+++ b/zuul.d/docker-images/gerrit.yaml
@@ -57,11 +57,11 @@
         override-checkout: stable-3.4
       # Backend behavior plugins
       - name: gerrit.googlesource.com/plugins/commit-message-length-validator
-        override-checkout: v3.4.4
+        override-checkout: v3.4.5
       - name: gerrit.googlesource.com/plugins/delete-project
         override-checkout: stable-3.4
       - name: gerrit.googlesource.com/plugins/hooks
-        override-checkout: v3.4.4
+        override-checkout: v3.4.5
       - name: gerrit.googlesource.com/plugins/its-base
         # There is no 3.4 branch
         override-checkout: master
@@ -69,20 +69,20 @@
         # There is no 3.4 branch
         override-checkout: master
       - name: gerrit.googlesource.com/plugins/plugin-manager
-        override-checkout: v3.4.4
+        override-checkout: v3.4.5
       - name: gerrit.googlesource.com/plugins/replication
         override-checkout: stable-3.4
       - name: gerrit.googlesource.com/plugins/reviewnotes
-        override-checkout: v3.4.4
+        override-checkout: v3.4.5
       - name: gerrit.googlesource.com/plugins/singleusergroup
-        override-checkout: v3.4.4
+        override-checkout: v3.4.5
       - name: gerrit.googlesource.com/plugins/webhooks
         override-checkout: stable-3.4
       # UI behavior plugins
       - name: gerrit.googlesource.com/plugins/codemirror-editor
         override-checkout: stable-3.4
       - name: gerrit.googlesource.com/plugins/download-commands
-        override-checkout: v3.4.4
+        override-checkout: v3.4.5
       - name: gerrit.googlesource.com/plugins/gitiles
         override-checkout: stable-3.4
       - name: gerrit.googlesource.com/plugins/zuul-results-summary
@@ -91,7 +91,7 @@
       - name: gerrit.googlesource.com/jgit
         override-checkout: master
       - name: gerrit.googlesource.com/polymer-bridges
-        override-checkout: v3.4.4
+        override-checkout: v3.4.5
     vars: &gerrit_vars_3_4
       docker_images:
         - context: docker/gerrit/bazel
@@ -148,11 +148,11 @@
         override-checkout: stable-3.5
       # Backend behavior plugins
       - name: gerrit.googlesource.com/plugins/commit-message-length-validator
-        override-checkout: v3.5.1
+        override-checkout: v3.5.2
       - name: gerrit.googlesource.com/plugins/delete-project
         override-checkout: stable-3.5
       - name: gerrit.googlesource.com/plugins/hooks
-        override-checkout: v3.5.1
+        override-checkout: v3.5.2
       - name: gerrit.googlesource.com/plugins/its-base
         # There is no 3.5 branch
         override-checkout: master
@@ -160,20 +160,20 @@
         # There is no 3.5 branch
         override-checkout: master
       - name: gerrit.googlesource.com/plugins/plugin-manager
-        override-checkout: v3.5.1
+        override-checkout: v3.5.2
       - name: gerrit.googlesource.com/plugins/replication
         override-checkout: stable-3.5
       - name: gerrit.googlesource.com/plugins/reviewnotes
-        override-checkout: v3.5.1
+        override-checkout: v3.5.2
       - name: gerrit.googlesource.com/plugins/singleusergroup
-        override-checkout: v3.5.1
+        override-checkout: v3.5.2
       - name: gerrit.googlesource.com/plugins/webhooks
         override-checkout: stable-3.5
       # UI behavior plugins
       - name: gerrit.googlesource.com/plugins/codemirror-editor
-        override-checkout: v3.5.1
+        override-checkout: v3.5.2
       - name: gerrit.googlesource.com/plugins/download-commands
-        override-checkout: v3.5.1
+        override-checkout: v3.5.2
       - name: gerrit.googlesource.com/plugins/gitiles
         override-checkout: stable-3.5
       - name: gerrit.googlesource.com/plugins/zuul-results-summary
@@ -182,7 +182,7 @@
       - name: gerrit.googlesource.com/jgit
         override-checkout: master
       - name: gerrit.googlesource.com/polymer-bridges
-        override-checkout: v3.5.1
+        override-checkout: v3.5.2
     vars: &gerrit_vars_3_5
       docker_images:
         - context: docker/gerrit/bazel