From da41905b79f3bdad24764ddc5c11ae008db0a5d4 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Fri, 15 Sep 2023 15:39:34 -0700
Subject: [PATCH] Update Gerrit to 3.7.5

Gerrit just released new point versions for all supported branches
including an update of 3.7 to 3.7.5. We also bump our 3.8 image up to
3.8.2 (note this isn't used in production, only for testing of the
upgrade to 3.8 currently).

Release notes can be found here:

  https://www.gerritcodereview.com/3.7.html#375
  https://www.gerritcodereview.com/3.8.html#382

The updates look minor for us, but there are some bug fixes so worth
updating. We might want to land this change as well as the bookworm
update together in order to do a single short gerrit downtime to get all
of these updates deployed in production.

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

diff --git a/docker/gerrit/base/Dockerfile b/docker/gerrit/base/Dockerfile
index 591902d598..a3bff3b85f 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.
 
-# Sun Jul 16 22:42:10 UTC 2023 - trigger rebuild
+# Fri Sep 15 22:39:09 UTC 2023 - 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 bd328a0d88..dd2c1684cc 100644
--- a/zuul.d/docker-images/gerrit.yaml
+++ b/zuul.d/docker-images/gerrit.yaml
@@ -61,11 +61,11 @@
         override-checkout: stable-3.7
       # Backend behavior plugins
       - name: gerrit.googlesource.com/plugins/commit-message-length-validator
-        override-checkout: v3.7.4
+        override-checkout: v3.7.5
       - name: gerrit.googlesource.com/plugins/delete-project
         override-checkout: stable-3.7
       - name: gerrit.googlesource.com/plugins/hooks
-        override-checkout: v3.7.4
+        override-checkout: v3.7.5
       - name: gerrit.googlesource.com/plugins/its-base
         # There is no 3.7 branch
         override-checkout: master
@@ -73,29 +73,29 @@
         # There is no 3.7 branch
         override-checkout: master
       - name: gerrit.googlesource.com/plugins/plugin-manager
-        override-checkout: v3.7.4
+        override-checkout: v3.7.5
       - name: gerrit.googlesource.com/plugins/replication
-        override-checkout: v3.7.4
+        override-checkout: v3.7.5
       - name: gerrit.googlesource.com/plugins/reviewnotes
-        override-checkout: v3.7.4
+        override-checkout: v3.7.5
       - name: gerrit.googlesource.com/plugins/singleusergroup
-        override-checkout: v3.7.4
+        override-checkout: v3.7.5
       - name: gerrit.googlesource.com/plugins/webhooks
-        override-checkout: v3.7.4
+        override-checkout: v3.7.5
       # UI behavior plugins
       - name: gerrit.googlesource.com/plugins/codemirror-editor
-        override-checkout: v3.7.4
+        override-checkout: v3.7.5
       - name: gerrit.googlesource.com/plugins/download-commands
-        override-checkout: v3.7.4
+        override-checkout: v3.7.5
       - name: gerrit.googlesource.com/plugins/gitiles
-        override-checkout: v3.7.4
+        override-checkout: v3.7.5
       - 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.7.4
+        override-checkout: v3.7.5
     vars: &gerrit_vars_3_7
       docker_images:
         - context: docker/gerrit/bazel
@@ -152,11 +152,11 @@
         override-checkout: stable-3.8
       # Backend behavior plugins
       - name: gerrit.googlesource.com/plugins/commit-message-length-validator
-        override-checkout: v3.8.1
+        override-checkout: v3.8.2
       - name: gerrit.googlesource.com/plugins/delete-project
         override-checkout: stable-3.8
       - name: gerrit.googlesource.com/plugins/hooks
-        override-checkout: v3.8.1
+        override-checkout: v3.8.2
       - name: gerrit.googlesource.com/plugins/its-base
         # There is no 3.8 branch
         override-checkout: master
@@ -164,29 +164,29 @@
         # There is no 3.8 branch
         override-checkout: master
       - name: gerrit.googlesource.com/plugins/plugin-manager
-        override-checkout: v3.8.1
+        override-checkout: v3.8.2
       - name: gerrit.googlesource.com/plugins/replication
-        override-checkout: v3.8.1
+        override-checkout: v3.8.2
       - name: gerrit.googlesource.com/plugins/reviewnotes
-        override-checkout: v3.8.1
+        override-checkout: v3.8.2
       - name: gerrit.googlesource.com/plugins/singleusergroup
-        override-checkout: v3.8.1
+        override-checkout: v3.8.2
       - name: gerrit.googlesource.com/plugins/webhooks
-        override-checkout: v3.8.1
+        override-checkout: v3.8.2
       # UI behavior plugins
       - name: gerrit.googlesource.com/plugins/codemirror-editor
-        override-checkout: v3.8.1
+        override-checkout: v3.8.2
       - name: gerrit.googlesource.com/plugins/download-commands
-        override-checkout: v3.8.1
+        override-checkout: v3.8.2
       - name: gerrit.googlesource.com/plugins/gitiles
-        override-checkout: v3.8.1
+        override-checkout: v3.8.2
       - 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.8.1
+        override-checkout: v3.8.2
     vars: &gerrit_vars_3_8
       docker_images:
         - context: docker/gerrit/bazel