From 715cfa709d82ed198d80cdabc60d194262f6a164 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Fri, 9 Aug 2024 08:59:15 -0700
Subject: [PATCH] Update Gerrit image to 3.9.6

Update our Gerrit 3.9 image to 3.9.6 and our 3.10 image to 3.10.1. The
3.9.6 update is the one that will be deployed to production (3.10 is
only used for testing currently) and has the most relevant changes as a
result. The release notes for that release can be found here:

  https://www.gerritcodereview.com/3.9.html

There are bugfixes and performance updates. Notably the replication
plugins sees some updates. I don't expect these updates to affect our
use of the replication plugin but we should be on the lookout for any
unexpected behavior changes with this plugin.

Change-Id: Ida223104076bb161443269335a43efeb1bdf40e3
---
 zuul.d/docker-images/gerrit.yaml | 46 ++++++++++++++++----------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/zuul.d/docker-images/gerrit.yaml b/zuul.d/docker-images/gerrit.yaml
index e7c1cb3841..97433f1d39 100644
--- a/zuul.d/docker-images/gerrit.yaml
+++ b/zuul.d/docker-images/gerrit.yaml
@@ -62,11 +62,11 @@
         override-checkout: stable-3.9
       # Backend behavior plugins
       - name: gerrit.googlesource.com/plugins/commit-message-length-validator
-        override-checkout: v3.9.5
+        override-checkout: v3.9.6
       - name: gerrit.googlesource.com/plugins/delete-project
         override-checkout: stable-3.9
       - name: gerrit.googlesource.com/plugins/hooks
-        override-checkout: v3.9.5
+        override-checkout: v3.9.6
       - name: gerrit.googlesource.com/plugins/its-base
         # There is no 3.9 branch
         override-checkout: master
@@ -74,22 +74,22 @@
         # There is no 3.9 branch
         override-checkout: master
       - name: gerrit.googlesource.com/plugins/plugin-manager
-        override-checkout: v3.9.5
+        override-checkout: v3.9.6
       - name: gerrit.googlesource.com/plugins/replication
-        override-checkout: v3.9.5
+        override-checkout: v3.9.6
       - name: gerrit.googlesource.com/plugins/reviewnotes
-        override-checkout: v3.9.5
+        override-checkout: v3.9.6
       - name: gerrit.googlesource.com/plugins/singleusergroup
-        override-checkout: v3.9.5
+        override-checkout: v3.9.6
       - name: gerrit.googlesource.com/plugins/webhooks
-        override-checkout: v3.9.5
+        override-checkout: v3.9.6
       # UI behavior plugins
       - name: gerrit.googlesource.com/plugins/codemirror-editor
-        override-checkout: v3.9.5
+        override-checkout: v3.9.6
       - name: gerrit.googlesource.com/plugins/download-commands
-        override-checkout: v3.9.5
+        override-checkout: v3.9.6
       - name: gerrit.googlesource.com/plugins/gitiles
-        override-checkout: v3.9.5
+        override-checkout: v3.9.6
       - name: gerrit.googlesource.com/plugins/zuul-results-summary
         override-checkout: main
       # Non plugin submodules
@@ -98,7 +98,7 @@
       - name: gerrit.googlesource.com/jgit
         override-checkout: master
       - name: gerrit.googlesource.com/polymer-bridges
-        override-checkout: v3.9.5
+        override-checkout: v3.9.6
     vars: &gerrit_vars_3_9
       docker_images:
         - context: docker/gerrit/bazel
@@ -155,11 +155,11 @@
         override-checkout: stable-3.10
       # Backend behavior plugins
       - name: gerrit.googlesource.com/plugins/commit-message-length-validator
-        override-checkout: v3.10.0
+        override-checkout: v3.10.1
       - name: gerrit.googlesource.com/plugins/delete-project
-        override-checkout: v3.10.0
+        override-checkout: v3.10.1
       - name: gerrit.googlesource.com/plugins/hooks
-        override-checkout: v3.10.0
+        override-checkout: v3.10.1
       - name: gerrit.googlesource.com/plugins/its-base
         # There is no 3.10 branch
         override-checkout: master
@@ -167,22 +167,22 @@
         # There is no 3.10 branch
         override-checkout: master
       - name: gerrit.googlesource.com/plugins/plugin-manager
-        override-checkout: v3.10.0
+        override-checkout: v3.10.1
       - name: gerrit.googlesource.com/plugins/replication
-        override-checkout: v3.10.0
+        override-checkout: v3.10.1
       - name: gerrit.googlesource.com/plugins/reviewnotes
-        override-checkout: v3.10.0
+        override-checkout: v3.10.1
       - name: gerrit.googlesource.com/plugins/singleusergroup
-        override-checkout: v3.10.0
+        override-checkout: v3.10.1
       - name: gerrit.googlesource.com/plugins/webhooks
-        override-checkout: v3.10.0
+        override-checkout: v3.10.1
       # UI behavior plugins
       - name: gerrit.googlesource.com/plugins/codemirror-editor
-        override-checkout: v3.10.0
+        override-checkout: v3.10.1
       - name: gerrit.googlesource.com/plugins/download-commands
-        override-checkout: v3.10.0
+        override-checkout: v3.10.1
       - name: gerrit.googlesource.com/plugins/gitiles
-        override-checkout: v3.10.0
+        override-checkout: v3.10.1
       - name: gerrit.googlesource.com/plugins/zuul-results-summary
         override-checkout: main
       # Non plugin submodules
@@ -191,7 +191,7 @@
       - name: gerrit.googlesource.com/jgit
         override-checkout: master
       - name: gerrit.googlesource.com/polymer-bridges
-        override-checkout: v3.10.0
+        override-checkout: v3.10.1
     vars: &gerrit_vars_3_10
       docker_images:
         - context: docker/gerrit/bazel