From e5ea6ebc38758f71a32755f210e657d00c2d4566 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Tue, 3 Aug 2021 09:05:14 -0700 Subject: [PATCH] Rebuild gerrit images to include fixes We upstreamed fixes for the mariadb jdbc connector and users being able to orphan their accounts through accidental deletion of their openid external ids. These fixes are now present in both the stable-3.2 and stable-3.3 branches of gerrit. We should rebuild these images to ensure our images include the fixes. Note that stable-3.4 does not yet include these fixes but should in time. We will update our jdbc connection url in a followup change as we don't auto update our images. This way we can ensure that the new image is ready to go before updating that config. Change-Id: Id23215ddfb3bd4424109e77ecd3480ed2375431d --- docker/gerrit/base/Dockerfile | 2 +- zuul.d/docker-images/gerrit.yaml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/docker/gerrit/base/Dockerfile b/docker/gerrit/base/Dockerfile index 9d78ece49f..aadee0b46a 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 Jul 2 03:59:25 PM UTC 2021 - trigger rebuild +# Tue Aug 3 16:04:54 UTC 2021 - trigger rebuild FROM docker.io/opendevorg/python-builder:3.7 as builder diff --git a/zuul.d/docker-images/gerrit.yaml b/zuul.d/docker-images/gerrit.yaml index c60e07f38f..f962d575eb 100644 --- a/zuul.d/docker-images/gerrit.yaml +++ b/zuul.d/docker-images/gerrit.yaml @@ -151,9 +151,9 @@ override-checkout: stable-3.3 # Plugins common to every build with branches or refs for every build - name: gerrit.googlesource.com/plugins/commit-message-length-validator - override-checkout: v3.3.4 + override-checkout: v3.3.5 - name: gerrit.googlesource.com/plugins/hooks - override-checkout: v3.3.4 + override-checkout: v3.3.5 - name: gerrit.googlesource.com/plugins/its-base # There is no 3.3 branch override-checkout: master @@ -166,30 +166,30 @@ - name: gerrit.googlesource.com/plugins/replication override-checkout: stable-3.3 - name: gerrit.googlesource.com/plugins/reviewnotes - override-checkout: v3.3.4 + override-checkout: v3.3.5 # Plugins common to every build without branches or refs for every build - name: gerrit.googlesource.com/plugins/download-commands - override-checkout: v3.3.4 + override-checkout: v3.3.5 - name: gerrit.googlesource.com/plugins/singleusergroup override-checkout: stable-3.3 # Plugins not common to every build - name: gerrit.googlesource.com/plugins/codemirror-editor - override-checkout: v3.3.4 + override-checkout: v3.3.5 - name: gerrit.googlesource.com/plugins/delete-project - override-checkout: v3.3.4 + override-checkout: v3.3.5 - name: gerrit.googlesource.com/plugins/gitiles override-checkout: stable-3.3 - name: gerrit.googlesource.com/plugins/plugin-manager - override-checkout: v3.3.4 + override-checkout: v3.3.5 - name: gerrit.googlesource.com/plugins/webhooks - override-checkout: v3.3.4 + override-checkout: v3.3.5 - 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.3.4 + override-checkout: v3.3.5 vars: &gerrit_vars_3_3 docker_images: - context: docker/gerrit/bazel