From fb5fa3fcf6bd58495164207590e0ce6721e94beb Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Tue, 1 Apr 2025 08:23:23 -0700
Subject: [PATCH] Update Gerrit images to 3.10.5 and 3.11.2
We currently deploy 3.10 to production so we will want to do a Gerrit
restart after this change lands and images are published. Keep that in
mind when approving.
The changelogs for these releases seem to largely by JGit improvments
with some other bugfixes. Full changelogs can be found here:
https://www.gerritcodereview.com/3.10.html#3105
https://www.gerritcodereview.com/3.11.html#3112
Change-Id: I2e06a79283556e1218bdbc5a7f8390b9b6ba5246
---
docker/gerrit/base/Dockerfile | 2 +-
zuul.d/docker-images/gerrit.yaml | 48 ++++++++++++++++----------------
2 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/docker/gerrit/base/Dockerfile b/docker/gerrit/base/Dockerfile
index 1cc66f5b67..19336f592c 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 Jan 13 08:47:45 PM UTC 2025 - trigger rebuild
+# Tue Apr 1 03:23:07 PM UTC 2025 - trigger rebuild
FROM docker.io/opendevorg/python-builder:3.11-bookworm as builder
diff --git a/zuul.d/docker-images/gerrit.yaml b/zuul.d/docker-images/gerrit.yaml
index b2c3d960aa..6df238bf2b 100644
--- a/zuul.d/docker-images/gerrit.yaml
+++ b/zuul.d/docker-images/gerrit.yaml
@@ -62,11 +62,11 @@
override-checkout: stable-3.10
# Backend behavior plugins
- name: gerrit.googlesource.com/plugins/commit-message-length-validator
- override-checkout: v3.10.4
+ override-checkout: v3.10.5
- name: gerrit.googlesource.com/plugins/delete-project
- override-checkout: v3.10.4
+ override-checkout: v3.10.5
- name: gerrit.googlesource.com/plugins/hooks
- override-checkout: v3.10.4
+ override-checkout: v3.10.5
- name: gerrit.googlesource.com/plugins/its-base
# There is no 3.10 branch
override-checkout: master
@@ -74,22 +74,22 @@
# There is no 3.10 branch
override-checkout: master
- name: gerrit.googlesource.com/plugins/plugin-manager
- override-checkout: v3.10.4
+ override-checkout: v3.10.5
- name: gerrit.googlesource.com/plugins/replication
- override-checkout: v3.10.4
+ override-checkout: v3.10.5
- name: gerrit.googlesource.com/plugins/reviewnotes
- override-checkout: v3.10.4
+ override-checkout: v3.10.5
- name: gerrit.googlesource.com/plugins/singleusergroup
- override-checkout: v3.10.4
+ override-checkout: v3.10.5
- name: gerrit.googlesource.com/plugins/webhooks
- override-checkout: v3.10.4
+ override-checkout: v3.10.5
# UI behavior plugins
- name: gerrit.googlesource.com/plugins/codemirror-editor
- override-checkout: v3.10.4
+ override-checkout: v3.10.5
- name: gerrit.googlesource.com/plugins/download-commands
- override-checkout: v3.10.4
+ override-checkout: v3.10.5
- name: gerrit.googlesource.com/plugins/gitiles
- override-checkout: v3.10.4
+ override-checkout: v3.10.5
- 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.10.4
+ override-checkout: v3.10.5
vars: &gerrit_vars_3_10
docker_images:
- context: docker/gerrit/bazel
@@ -155,11 +155,11 @@
override-checkout: stable-3.11
# Backend behavior plugins
- name: gerrit.googlesource.com/plugins/commit-message-length-validator
- override-checkout: v3.11.1
+ override-checkout: v3.11.2
- name: gerrit.googlesource.com/plugins/delete-project
- override-checkout: v3.11.1
+ override-checkout: v3.11.2
- name: gerrit.googlesource.com/plugins/hooks
- override-checkout: v3.11.1
+ override-checkout: v3.11.2
- name: gerrit.googlesource.com/plugins/its-base
# There is no 3.11 branch
override-checkout: master
@@ -167,22 +167,22 @@
# There is no 3.11 branch
override-checkout: master
- name: gerrit.googlesource.com/plugins/plugin-manager
- override-checkout: v3.11.1
+ override-checkout: v3.11.2
- name: gerrit.googlesource.com/plugins/replication
- override-checkout: v3.11.1
+ override-checkout: v3.11.2
- name: gerrit.googlesource.com/plugins/reviewnotes
- override-checkout: v3.11.1
+ override-checkout: v3.11.2
- name: gerrit.googlesource.com/plugins/singleusergroup
- override-checkout: v3.11.1
+ override-checkout: v3.11.2
- name: gerrit.googlesource.com/plugins/webhooks
- override-checkout: v3.11.1
+ override-checkout: v3.11.2
# UI behavior plugins
- name: gerrit.googlesource.com/plugins/codemirror-editor
- override-checkout: v3.11.1
+ override-checkout: v3.11.2
- name: gerrit.googlesource.com/plugins/download-commands
- override-checkout: v3.11.1
+ override-checkout: v3.11.2
- name: gerrit.googlesource.com/plugins/gitiles
- override-checkout: v3.11.1
+ override-checkout: v3.11.2
- 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.11.1
+ override-checkout: v3.11.2
vars: &gerrit_vars_3_11
docker_images:
- context: docker/gerrit/bazel