From de10234b9b7065ac6bd85d476beb9950ff312c28 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Mon, 10 Jan 2022 09:17:42 -0800 Subject: [PATCH] Better organize gerrit plugins in job defs The comments around the organization of these plugins wasn't accurate. Instead of grouping them by git repo state group them by what functionality they affect. Change-Id: I6a21574e7079b7ddda520f727bef5562e5999126 --- zuul.d/docker-images/gerrit.yaml | 54 ++++++++++++++++---------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/zuul.d/docker-images/gerrit.yaml b/zuul.d/docker-images/gerrit.yaml index a31aa31ca3..7310fb1013 100644 --- a/zuul.d/docker-images/gerrit.yaml +++ b/zuul.d/docker-images/gerrit.yaml @@ -55,9 +55,11 @@ override-checkout: master - name: gerrit.googlesource.com/gerrit override-checkout: stable-3.3 - # Plugins common to every build with branches or refs for every build + # Backend behavior plugins - name: gerrit.googlesource.com/plugins/commit-message-length-validator override-checkout: v3.3.9 + - name: gerrit.googlesource.com/plugins/delete-project + override-checkout: stable-3.3 - name: gerrit.googlesource.com/plugins/hooks override-checkout: v3.3.9 - name: gerrit.googlesource.com/plugins/its-base @@ -66,25 +68,22 @@ - name: gerrit.googlesource.com/plugins/its-storyboard # There is no 3.3 branch override-checkout: master + - name: gerrit.googlesource.com/plugins/plugin-manager + override-checkout: v3.3.9 - name: gerrit.googlesource.com/plugins/replication override-checkout: stable-3.3 - name: gerrit.googlesource.com/plugins/reviewnotes override-checkout: v3.3.9 - # Plugins common to every build without branches or refs for every build - - name: gerrit.googlesource.com/plugins/download-commands - override-checkout: v3.3.9 - name: gerrit.googlesource.com/plugins/singleusergroup override-checkout: stable-3.3 - # Plugins not common to every build + - name: gerrit.googlesource.com/plugins/webhooks + override-checkout: stable-3.3 + # UI behavior plugins - name: gerrit.googlesource.com/plugins/codemirror-editor override-checkout: stable-3.3 - - name: gerrit.googlesource.com/plugins/delete-project - override-checkout: stable-3.3 - - name: gerrit.googlesource.com/plugins/gitiles - override-checkout: stable-3.3 - - name: gerrit.googlesource.com/plugins/plugin-manager + - name: gerrit.googlesource.com/plugins/download-commands override-checkout: v3.3.9 - - name: gerrit.googlesource.com/plugins/webhooks + - name: gerrit.googlesource.com/plugins/gitiles override-checkout: stable-3.3 - name: gerrit.googlesource.com/plugins/zuul-results-summary override-checkout: main @@ -147,9 +146,11 @@ override-checkout: master - name: gerrit.googlesource.com/gerrit override-checkout: stable-3.4 - # Plugins common to every build with branches or refs for every build + # Backend behavior plugins - name: gerrit.googlesource.com/plugins/commit-message-length-validator override-checkout: v3.4.3 + - name: gerrit.googlesource.com/plugins/delete-project + override-checkout: stable-3.4 - name: gerrit.googlesource.com/plugins/hooks override-checkout: v3.4.3 - name: gerrit.googlesource.com/plugins/its-base @@ -158,25 +159,22 @@ - name: gerrit.googlesource.com/plugins/its-storyboard # There is no 3.4 branch override-checkout: master + - name: gerrit.googlesource.com/plugins/plugin-manager + override-checkout: v3.4.3 - name: gerrit.googlesource.com/plugins/replication override-checkout: stable-3.4 - name: gerrit.googlesource.com/plugins/reviewnotes override-checkout: v3.4.3 - # Plugins common to every build without branches or refs for every build - - name: gerrit.googlesource.com/plugins/download-commands - override-checkout: v3.4.3 - name: gerrit.googlesource.com/plugins/singleusergroup override-checkout: v3.4.3 - # Plugins not common to every build + - name: gerrit.googlesource.com/plugins/webhooks + override-checkout: stable-3.4 + # UI behavior plugins - name: gerrit.googlesource.com/plugins/codemirror-editor override-checkout: stable-3.4 - - name: gerrit.googlesource.com/plugins/delete-project - override-checkout: stable-3.4 - - name: gerrit.googlesource.com/plugins/gitiles - override-checkout: stable-3.4 - - name: gerrit.googlesource.com/plugins/plugin-manager + - name: gerrit.googlesource.com/plugins/download-commands override-checkout: v3.4.3 - - name: gerrit.googlesource.com/plugins/webhooks + - name: gerrit.googlesource.com/plugins/gitiles override-checkout: stable-3.4 - name: gerrit.googlesource.com/plugins/zuul-results-summary override-checkout: main @@ -239,14 +237,10 @@ provides: gerrit-master-container-image required-projects: &gerrit_projects_master - opendev/system-config - - gerrit.googlesource.com/jgit - gerrit.googlesource.com/gerrit - - gerrit.googlesource.com/plugins/checks - - gerrit.googlesource.com/plugins/codemirror-editor + # Backend behavior plugins - gerrit.googlesource.com/plugins/commit-message-length-validator - gerrit.googlesource.com/plugins/delete-project - - gerrit.googlesource.com/plugins/download-commands - - gerrit.googlesource.com/plugins/gitiles - gerrit.googlesource.com/plugins/hooks - gerrit.googlesource.com/plugins/its-base - gerrit.googlesource.com/plugins/its-storyboard @@ -255,8 +249,14 @@ - gerrit.googlesource.com/plugins/reviewnotes - gerrit.googlesource.com/plugins/singleusergroup - gerrit.googlesource.com/plugins/webhooks + # UI behavior plugins + - gerrit.googlesource.com/plugins/checks + - gerrit.googlesource.com/plugins/codemirror-editor + - gerrit.googlesource.com/plugins/download-commands + - gerrit.googlesource.com/plugins/gitiles - name: gerrit.googlesource.com/plugins/zuul-results-summary override-checkout: main + - gerrit.googlesource.com/jgit - gerrit.googlesource.com/polymer-bridges vars: &gerrit_vars_master zuul_work_dir: src/opendev.org/opendev/system-config