Merge "Update gerrit image builds for 3.6.4 and 3.7.1 tags"

docker/gerrit/base/Dockerfile

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Fri 02 Dec 2022 07:17:22 AEDT - trigger rebuild
+# Thu Mar  2 22:04:19 UTC 2023 - trigger rebuild
 
 FROM docker.io/opendevorg/python-builder:3.9-bullseye as builder
 

zuul.d/docker-images/gerrit.yaml

@@ -61,11 +61,11 @@
         override-checkout: stable-3.6
       # Backend behavior plugins
       - name: gerrit.googlesource.com/plugins/commit-message-length-validator
-        override-checkout: v3.6.3
+        override-checkout: v3.6.4
       - name: gerrit.googlesource.com/plugins/delete-project
-        override-checkout: v3.6.3
+        override-checkout: v3.6.4
       - name: gerrit.googlesource.com/plugins/hooks
-        override-checkout: v3.6.3
+        override-checkout: v3.6.4
       - name: gerrit.googlesource.com/plugins/its-base
         # There is no 3.6 branch
         override-checkout: master
@@ -73,32 +73,29 @@
         # There is no 3.6 branch
         override-checkout: master
       - name: gerrit.googlesource.com/plugins/plugin-manager
-        override-checkout: v3.6.3
+        override-checkout: v3.6.4
       - name: gerrit.googlesource.com/plugins/replication
-        override-checkout: v3.6.3
+        override-checkout: v3.6.4
       - name: gerrit.googlesource.com/plugins/reviewnotes
-        # Temporarily checkout master to include FloggerLogString
-        # build error fixes. These errors have started due to a
-        # recent Bazel update
-        override-checkout: master
+        override-checkout: v3.6.4
       - name: gerrit.googlesource.com/plugins/singleusergroup
-        override-checkout: v3.6.3
+        override-checkout: v3.6.4
       - name: gerrit.googlesource.com/plugins/webhooks
-        override-checkout: v3.6.3
+        override-checkout: v3.6.4
       # UI behavior plugins
       - name: gerrit.googlesource.com/plugins/codemirror-editor
-        override-checkout: v3.6.3
+        override-checkout: v3.6.4
       - name: gerrit.googlesource.com/plugins/download-commands
-        override-checkout: v3.6.3
+        override-checkout: v3.6.4
       - name: gerrit.googlesource.com/plugins/gitiles
-        override-checkout: v3.6.3
+        override-checkout: v3.6.4
       - 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.3
+        override-checkout: v3.6.4
     vars: &gerrit_vars_3_6
       docker_images:
         - context: docker/gerrit/bazel
@@ -155,11 +152,11 @@
         override-checkout: stable-3.7
       # Backend behavior plugins
       - name: gerrit.googlesource.com/plugins/commit-message-length-validator
-        override-checkout: v3.7.0
+        override-checkout: v3.7.1
       - name: gerrit.googlesource.com/plugins/delete-project
-        override-checkout: v3.7.0
+        override-checkout: v3.7.1
       - name: gerrit.googlesource.com/plugins/hooks
-        override-checkout: v3.7.0
+        override-checkout: v3.7.1
       - name: gerrit.googlesource.com/plugins/its-base
         # There is no 3.7 branch
         override-checkout: master
@@ -167,29 +164,29 @@
         # There is no 3.7 branch
         override-checkout: master
       - name: gerrit.googlesource.com/plugins/plugin-manager
-        override-checkout: v3.7.0
+        override-checkout: v3.7.1
       - name: gerrit.googlesource.com/plugins/replication
-        override-checkout: v3.7.0
+        override-checkout: v3.7.1
       - name: gerrit.googlesource.com/plugins/reviewnotes
-        override-checkout: v3.7.0
+        override-checkout: v3.7.1
       - name: gerrit.googlesource.com/plugins/singleusergroup
-        override-checkout: v3.7.0
+        override-checkout: v3.7.1
       - name: gerrit.googlesource.com/plugins/webhooks
-        override-checkout: v3.7.0
+        override-checkout: v3.7.1
       # UI behavior plugins
       - name: gerrit.googlesource.com/plugins/codemirror-editor
-        override-checkout: v3.7.0
+        override-checkout: v3.7.1
       - name: gerrit.googlesource.com/plugins/download-commands
-        override-checkout: v3.7.0
+        override-checkout: v3.7.1
       - name: gerrit.googlesource.com/plugins/gitiles
-        override-checkout: v3.7.0
+        override-checkout: v3.7.1
       - 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.0
+        override-checkout: v3.7.1
     vars: &gerrit_vars_3_7
       docker_images:
         - context: docker/gerrit/bazel