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
This commit is contained in:
Ian Wienand 2020-12-16 14:23:15 +11:00 committed by Clark Boylan
parent d1694d4c98
commit 1858f15a8a
2 changed files with 8 additions and 14 deletions

View File

@ -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

View File

@ -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