From 1858f15a8aaf67e49bc413fd34e03fc18ffe31e5 Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Wed, 16 Dec 2020 14:23:15 +1100
Subject: [PATCH] gerrit: move plugins to common code

The "additional_plugins" variable is so different builds gerrit can
specify additional plugins specific to their version to install into
the base image.

Since we've moved to only building 3.2 and master images, a bunch of
plugins that used to be additional (because they weren't 2.XX era) are
now common.  Move them into the common plugin code in the playbook,
and leave the only one different for master, the "checks" plugin, as
separate.

Change-Id: I8966ed7b5436fbe012486dccc1028bc8cb1cf9e4
---
 playbooks/zuul/gerrit/repos.yaml | 11 ++++++++---
 zuul.d/docker-images/gerrit.yaml | 11 -----------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/playbooks/zuul/gerrit/repos.yaml b/playbooks/zuul/gerrit/repos.yaml
index c89c959102..11ed8c5274 100644
--- a/playbooks/zuul/gerrit/repos.yaml
+++ b/playbooks/zuul/gerrit/repos.yaml
@@ -15,20 +15,25 @@
           - unzip
         state: present
 
-    - name: Move plugin repos into gerrit tree
+    - name: Move common plugin repos into gerrit tree
       command: "mv -f {{ item }} ../gerrit/plugins"
       args:
         chdir: /home/zuul/src/gerrit.googlesource.com/plugins
       loop:
+        - codemirror-editor
         - commit-message-length-validator
+        - delete-project
+        - download-commands
+        - gitiles
         - hooks
-        - its-storyboard
         - its-base
+        - its-storyboard
         - javamelody
+        - plugin-manager
         - replication
         - reviewnotes
-        - download-commands
         - singleusergroup
+        - webhooks
 
     # Some submodules don't have appropriate refs to checkout for specific
     # gerrit branches. We address that by checking them out explicitly in
diff --git a/zuul.d/docker-images/gerrit.yaml b/zuul.d/docker-images/gerrit.yaml
index c6a41fd414..30d8983c28 100644
--- a/zuul.d/docker-images/gerrit.yaml
+++ b/zuul.d/docker-images/gerrit.yaml
@@ -96,12 +96,6 @@
           path: /home/zuul/src/gerrit.googlesource.com/gerrit
           tags:
             - 3.2
-      gerrit_additional_plugins:
-        - codemirror-editor
-        - delete-project
-        - gitiles
-        - plugin-manager
-        - webhooks
     files: &gerrit_files_3_2
       - docker/gerrit/base/
       - docker/gerrit/bazel/
@@ -174,11 +168,6 @@
             - master
       gerrit_additional_plugins:
         - checks
-        - codemirror-editor
-        - delete-project
-        - gitiles
-        - plugin-manager
-        - webhooks
 
 - job:
     name: system-config-build-image-gerrit-master