From 2d0449dd49618c1fc59489e66d213a6c19d42e5d Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Mon, 13 Jan 2025 12:48:01 -0800
Subject: [PATCH] Update Gerrit images to 3.10.4 and 3.11.1
Gerrit made new bugfix releases for the two images we're currently
building. The most important one is for 3.10.4 as we're currently
deploying 3.10 in production. The full changelog for 3.10.4 is here:
https://www.gerritcodereview.com/3.10.html
No breaking changes are noted. Primarily a bugfix release.
Bundling this update with a change to increase h2 compaction time may be
a good idea.
Change-Id: Ieed0cdb937681d9c30ede87e483ca0abe3c3c1ad
---
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 505baa172a..1cc66f5b67 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.
-# Tue Nov 26 08:05:02 PM UTC 2024 - trigger rebuild
+# Mon Jan 13 08:47:45 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 742931ee90..b2c3d960aa 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.3
+ override-checkout: v3.10.4
- name: gerrit.googlesource.com/plugins/delete-project
- override-checkout: v3.10.3
+ override-checkout: v3.10.4
- name: gerrit.googlesource.com/plugins/hooks
- override-checkout: v3.10.3
+ override-checkout: v3.10.4
- 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.3
+ override-checkout: v3.10.4
- name: gerrit.googlesource.com/plugins/replication
- override-checkout: v3.10.3
+ override-checkout: v3.10.4
- name: gerrit.googlesource.com/plugins/reviewnotes
- override-checkout: v3.10.3
+ override-checkout: v3.10.4
- name: gerrit.googlesource.com/plugins/singleusergroup
- override-checkout: v3.10.3
+ override-checkout: v3.10.4
- name: gerrit.googlesource.com/plugins/webhooks
- override-checkout: v3.10.3
+ override-checkout: v3.10.4
# UI behavior plugins
- name: gerrit.googlesource.com/plugins/codemirror-editor
- override-checkout: v3.10.3
+ override-checkout: v3.10.4
- name: gerrit.googlesource.com/plugins/download-commands
- override-checkout: v3.10.3
+ override-checkout: v3.10.4
- name: gerrit.googlesource.com/plugins/gitiles
- override-checkout: v3.10.3
+ override-checkout: v3.10.4
- 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.3
+ override-checkout: v3.10.4
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.0
+ override-checkout: v3.11.1
- name: gerrit.googlesource.com/plugins/delete-project
- override-checkout: v3.11.0
+ override-checkout: v3.11.1
- name: gerrit.googlesource.com/plugins/hooks
- override-checkout: v3.11.0
+ override-checkout: v3.11.1
- 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.0
+ override-checkout: v3.11.1
- name: gerrit.googlesource.com/plugins/replication
- override-checkout: v3.11.0
+ override-checkout: v3.11.1
- name: gerrit.googlesource.com/plugins/reviewnotes
- override-checkout: v3.11.0
+ override-checkout: v3.11.1
- name: gerrit.googlesource.com/plugins/singleusergroup
- override-checkout: v3.11.0
+ override-checkout: v3.11.1
- name: gerrit.googlesource.com/plugins/webhooks
- override-checkout: v3.11.0
+ override-checkout: v3.11.1
# UI behavior plugins
- name: gerrit.googlesource.com/plugins/codemirror-editor
- override-checkout: v3.11.0
+ override-checkout: v3.11.1
- name: gerrit.googlesource.com/plugins/download-commands
- override-checkout: v3.11.0
+ override-checkout: v3.11.1
- name: gerrit.googlesource.com/plugins/gitiles
- override-checkout: v3.11.0
+ override-checkout: v3.11.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.11.0
+ override-checkout: v3.11.1
vars: &gerrit_vars_3_11
docker_images:
- context: docker/gerrit/bazel