From 5e8d70427866769a97a440d433004ca4a10ad642 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Thu, 10 Nov 2022 08:45:50 -0800
Subject: [PATCH] Update Gerrit images to 3.5.4 and 3.6.3

Gerrit made new releases and we should update to them. Release notes can
be found here:

  https://www.gerritcodereview.com/3.5.html#354
  https://www.gerritcodereview.com/3.6.html#363

The main improvement for us is likely to be the copy approvals
performance boosts and error handling. We still need to run that prior
to our 3.6 upgrade.

Note we currently only run 3.5 in production but we test the 3.6 upgrade
from our current production version so it makes sense to update the 3.6
image as well.

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

diff --git a/docker/gerrit/base/Dockerfile b/docker/gerrit/base/Dockerfile
index ca964a5e37..3e7f3a0c02 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.
 
-# Thu Oct 13 23:53:46 UTC 2022 - trigger rebuild
+# Thu Nov 10 16:40:17 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 1cb02372a3..bf5cee8f9a 100644
--- a/zuul.d/docker-images/gerrit.yaml
+++ b/zuul.d/docker-images/gerrit.yaml
@@ -57,31 +57,31 @@
         override-checkout: stable-3.5
       # Backend behavior plugins
       - name: gerrit.googlesource.com/plugins/commit-message-length-validator
-        override-checkout: v3.5.3
+        override-checkout: v3.5.4
       - name: gerrit.googlesource.com/plugins/delete-project
         override-checkout: stable-3.5
       - name: gerrit.googlesource.com/plugins/hooks
-        override-checkout: v3.5.3
+        override-checkout: v3.5.4
       - name: gerrit.googlesource.com/plugins/its-base
         override-checkout: stable-3.5
       - name: gerrit.googlesource.com/plugins/its-storyboard
         # There is no 3.5 branch
         override-checkout: master
       - name: gerrit.googlesource.com/plugins/plugin-manager
-        override-checkout: v3.5.3
+        override-checkout: v3.5.4
       - name: gerrit.googlesource.com/plugins/replication
         override-checkout: stable-3.5
       - name: gerrit.googlesource.com/plugins/reviewnotes
-        override-checkout: v3.5.3
+        override-checkout: v3.5.4
       - name: gerrit.googlesource.com/plugins/singleusergroup
-        override-checkout: v3.5.3
+        override-checkout: v3.5.4
       - 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.3
+        override-checkout: v3.5.4
       - name: gerrit.googlesource.com/plugins/download-commands
-        override-checkout: v3.5.3
+        override-checkout: v3.5.4
       - name: gerrit.googlesource.com/plugins/gitiles
         override-checkout: stable-3.5
       - name: gerrit.googlesource.com/plugins/zuul-results-summary
@@ -90,7 +90,7 @@
       - name: gerrit.googlesource.com/jgit
         override-checkout: master
       - name: gerrit.googlesource.com/polymer-bridges
-        override-checkout: v3.5.3
+        override-checkout: v3.5.4
     vars: &gerrit_vars_3_5
       docker_images:
         - context: docker/gerrit/bazel
@@ -147,11 +147,11 @@
         override-checkout: stable-3.6
       # Backend behavior plugins
       - name: gerrit.googlesource.com/plugins/commit-message-length-validator
-        override-checkout: v3.6.2
+        override-checkout: v3.6.3
       - name: gerrit.googlesource.com/plugins/delete-project
-        override-checkout: v3.6.2
+        override-checkout: v3.6.3
       - name: gerrit.googlesource.com/plugins/hooks
-        override-checkout: v3.6.2
+        override-checkout: v3.6.3
       - name: gerrit.googlesource.com/plugins/its-base
         # There is no 3.6 branch
         override-checkout: master
@@ -159,29 +159,29 @@
         # There is no 3.6 branch
         override-checkout: master
       - name: gerrit.googlesource.com/plugins/plugin-manager
-        override-checkout: v3.6.2
+        override-checkout: v3.6.3
       - name: gerrit.googlesource.com/plugins/replication
-        override-checkout: v3.6.2
+        override-checkout: v3.6.3
       - name: gerrit.googlesource.com/plugins/reviewnotes
-        override-checkout: v3.6.2
+        override-checkout: v3.6.3
       - name: gerrit.googlesource.com/plugins/singleusergroup
-        override-checkout: v3.6.2
+        override-checkout: v3.6.3
       - name: gerrit.googlesource.com/plugins/webhooks
-        override-checkout: v3.6.2
+        override-checkout: v3.6.3
       # UI behavior plugins
       - name: gerrit.googlesource.com/plugins/codemirror-editor
-        override-checkout: v3.6.2
+        override-checkout: v3.6.3
       - name: gerrit.googlesource.com/plugins/download-commands
-        override-checkout: v3.6.2
+        override-checkout: v3.6.3
       - name: gerrit.googlesource.com/plugins/gitiles
-        override-checkout: v3.6.2
+        override-checkout: v3.6.3
       - name: gerrit.googlesource.com/plugins/zuul-results-summary
         override-checkout: main
       # Non plugin submodules
       - name: gerrit.googlesource.com/jgit
         override-checkout: master
       - name: gerrit.googlesource.com/polymer-bridges
-        override-checkout: v3.6.2
+        override-checkout: v3.6.3
     vars: &gerrit_vars_3_6
       docker_images:
         - context: docker/gerrit/bazel