From c02fe3019d64d22abb1c12cafaebc6462d454b1a Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Mon, 5 Jun 2023 13:44:50 -0700 Subject: [PATCH] Update Gerrit images to current versions Gerrit 3.8 has been released for a bit. Update our 3.8 image builds to pull the latest 3.8.1 version for testing. Gerrit 3.7.4 has also been released. We update our 3.7 images to 3.7.4. Note this is our production image and this update will affect prod unlike the 3.8.0 update. Changelog is here: https://www.gerritcodereview.com/3.7.html#374 The only breaking change is related to prometheus metrics which we aren't using (yet). Change-Id: I52854ed097e295c070e642808e9dae793dc8a716 --- docker/gerrit/base/Dockerfile | 2 +- zuul.d/docker-images/gerrit.yaml | 50 +++++++++++++++----------------- 2 files changed, 25 insertions(+), 27 deletions(-) diff --git a/docker/gerrit/base/Dockerfile b/docker/gerrit/base/Dockerfile index 99c4a9862e..591902d598 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. -# Fri May 12 15:23:23 UTC 2023 - trigger rebuild +# Sun Jul 16 22:42:10 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 186f2d97be..bd328a0d88 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.3 + override-checkout: v3.7.4 - name: gerrit.googlesource.com/plugins/delete-project - override-checkout: v3.7.3 + override-checkout: stable-3.7 - name: gerrit.googlesource.com/plugins/hooks - override-checkout: v3.7.3 + override-checkout: v3.7.4 - 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.3 + override-checkout: v3.7.4 - name: gerrit.googlesource.com/plugins/replication - override-checkout: v3.7.3 + override-checkout: v3.7.4 - name: gerrit.googlesource.com/plugins/reviewnotes - override-checkout: v3.7.3 + override-checkout: v3.7.4 - name: gerrit.googlesource.com/plugins/singleusergroup - override-checkout: v3.7.3 + override-checkout: v3.7.4 - name: gerrit.googlesource.com/plugins/webhooks - override-checkout: v3.7.3 + override-checkout: v3.7.4 # UI behavior plugins - name: gerrit.googlesource.com/plugins/codemirror-editor - override-checkout: v3.7.3 + override-checkout: v3.7.4 - name: gerrit.googlesource.com/plugins/download-commands - override-checkout: v3.7.3 + override-checkout: v3.7.4 - name: gerrit.googlesource.com/plugins/gitiles - override-checkout: v3.7.3 + override-checkout: v3.7.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.7.3 + override-checkout: v3.7.4 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.0-rc3 + override-checkout: v3.8.1 - name: gerrit.googlesource.com/plugins/delete-project - override-checkout: v3.8.0-rc3 + override-checkout: stable-3.8 - name: gerrit.googlesource.com/plugins/hooks - override-checkout: v3.8.0-rc3 + override-checkout: v3.8.1 - name: gerrit.googlesource.com/plugins/its-base # There is no 3.8 branch override-checkout: master @@ -164,31 +164,29 @@ # There is no 3.8 branch override-checkout: master - name: gerrit.googlesource.com/plugins/plugin-manager - override-checkout: v3.8.0-rc3 + override-checkout: v3.8.1 - name: gerrit.googlesource.com/plugins/replication - override-checkout: v3.8.0-rc3 - # The v3.8.0-rc3 version of reviewnotes fails with - # plugins/reviewnotes/src/main/java/com/googlesource/gerrit/plugins/reviewnotes/RefUpdateListener.java:73: error: [ReturnMissingNullable] Method returns a definitely null value but is not annotated @Nullable + override-checkout: v3.8.1 - name: gerrit.googlesource.com/plugins/reviewnotes - override-checkout: master + override-checkout: v3.8.1 - name: gerrit.googlesource.com/plugins/singleusergroup - override-checkout: v3.8.0-rc3 + override-checkout: v3.8.1 - name: gerrit.googlesource.com/plugins/webhooks - override-checkout: v3.8.0-rc3 + override-checkout: v3.8.1 # UI behavior plugins - name: gerrit.googlesource.com/plugins/codemirror-editor - override-checkout: v3.8.0-rc3 + override-checkout: v3.8.1 - name: gerrit.googlesource.com/plugins/download-commands - override-checkout: v3.8.0-rc3 + override-checkout: v3.8.1 - name: gerrit.googlesource.com/plugins/gitiles - override-checkout: v3.8.0-rc3 + override-checkout: v3.8.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.8.0-rc3 + override-checkout: v3.8.1 vars: &gerrit_vars_3_8 docker_images: - context: docker/gerrit/bazel