From 999edcc88b51ebb0c0207a959d2bb5356d7966f6 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Fri, 10 Dec 2021 09:21:39 -0800 Subject: [PATCH] Remove melody We don't need this plugin right now Change-Id: I7b2f0d831579076d890ef8dd3bbe6e14fa1371bc --- docker/gerrit/base/Dockerfile | 2 +- playbooks/zuul/gerrit/repos.yaml | 9 --------- zuul.d/docker-images/gerrit.yaml | 7 ------- 3 files changed, 1 insertion(+), 17 deletions(-) diff --git a/docker/gerrit/base/Dockerfile b/docker/gerrit/base/Dockerfile index b4787794e3..9bfe9f4dac 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 30 00:12:50 UTC 2021 - trigger rebuild +# Fri Dec 10 17:21:05 UTC 2021 - trigger rebuild FROM docker.io/opendevorg/python-builder:3.9-bullseye as builder diff --git a/playbooks/zuul/gerrit/repos.yaml b/playbooks/zuul/gerrit/repos.yaml index 2ba0ee4566..07ac521bd3 100644 --- a/playbooks/zuul/gerrit/repos.yaml +++ b/playbooks/zuul/gerrit/repos.yaml @@ -38,7 +38,6 @@ - hooks - its-base - its-storyboard - - javamelody - plugin-manager - replication - reviewnotes @@ -72,11 +71,3 @@ loop: - its-storyboard - its-base - - javamelody - - - name: Configure javamelody external plugin deps - file: - state: link - force: yes - src: javamelody/external_plugin_deps.bzl - path: /home/zuul/src/gerrit.googlesource.com/gerrit/plugins/external_plugin_deps.bzl diff --git a/zuul.d/docker-images/gerrit.yaml b/zuul.d/docker-images/gerrit.yaml index 7745323915..409ee0e632 100644 --- a/zuul.d/docker-images/gerrit.yaml +++ b/zuul.d/docker-images/gerrit.yaml @@ -66,9 +66,6 @@ - name: gerrit.googlesource.com/plugins/its-storyboard # There is no 3.3 branch override-checkout: master - - name: gerrit.googlesource.com/plugins/javamelody - # There is no 3.3 branch - override-checkout: master - name: gerrit.googlesource.com/plugins/replication override-checkout: stable-3.3 - name: gerrit.googlesource.com/plugins/reviewnotes @@ -161,9 +158,6 @@ - name: gerrit.googlesource.com/plugins/its-storyboard # There is no 3.4 branch override-checkout: master - - name: gerrit.googlesource.com/plugins/javamelody - # There is no 3.4 branch - override-checkout: master - name: gerrit.googlesource.com/plugins/replication override-checkout: stable-3.4 - name: gerrit.googlesource.com/plugins/reviewnotes @@ -256,7 +250,6 @@ - gerrit.googlesource.com/plugins/hooks - gerrit.googlesource.com/plugins/its-base - gerrit.googlesource.com/plugins/its-storyboard - - gerrit.googlesource.com/plugins/javamelody - gerrit.googlesource.com/plugins/plugin-manager - gerrit.googlesource.com/plugins/replication - gerrit.googlesource.com/plugins/reviewnotes