From 31d71e637906c2911d6bc796e47fb3a96e7962ba Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Tue, 21 Mar 2023 11:51:45 +1100
Subject: [PATCH] gerrit images : trigger rebuild
Trigger a rebuild from the stable-3.7 branch head to pickup
https://gerrit-review.googlesource.com/c/gerrit/+/364214
which fixes the redirection of the "submitted together" links when you
have multiple changes stacked; upstream bug report
https://bugs.chromium.org/p/gerrit/issues/detail?id=16765
Change
https://gerrit-review.googlesource.com/c/gerrit/+/362878
has merged into stable-3.6 and stable-3.7 branches, and requires a
corresponding update to the download-commands plugin
https://gerrit-review.googlesource.com/c/plugins/download-commands/+/362879
Since there are no stable releases yet, the plugin hasn't made new
tags. We switch this to master until we have stable tags.
Change-Id: I93715081a802894420003caf9d01c1d349d80650
---
docker/gerrit/base/Dockerfile | 2 +-
zuul.d/docker-images/gerrit.yaml | 8 ++++++--
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/docker/gerrit/base/Dockerfile b/docker/gerrit/base/Dockerfile
index 3f1b6092f8..698d5488c7 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.
-# Thu Mar 2 22:04:19 UTC 2023 - trigger rebuild
+# Tue 21 Mar 2023 11:51:37 AEDT - 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 b97c63c45a..94c5a200b6 100644
--- a/zuul.d/docker-images/gerrit.yaml
+++ b/zuul.d/docker-images/gerrit.yaml
@@ -85,8 +85,10 @@
# UI behavior plugins
- name: gerrit.googlesource.com/plugins/codemirror-editor
override-checkout: v3.6.4
+ # Requires master until new stable-3.6 release and
+ # subsequent plugin tag
- name: gerrit.googlesource.com/plugins/download-commands
- override-checkout: v3.6.4
+ override-checkout: master
- name: gerrit.googlesource.com/plugins/gitiles
override-checkout: v3.6.4
- name: gerrit.googlesource.com/plugins/zuul-results-summary
@@ -176,8 +178,10 @@
# UI behavior plugins
- name: gerrit.googlesource.com/plugins/codemirror-editor
override-checkout: v3.7.1
+ # Requires master until new stable-3.7 release and
+ # subsequent plugin tag
- name: gerrit.googlesource.com/plugins/download-commands
- override-checkout: v3.7.1
+ override-checkout: master
- name: gerrit.googlesource.com/plugins/gitiles
override-checkout: v3.7.1
- name: gerrit.googlesource.com/plugins/zuul-results-summary