Merge "Build Gerrit 3.3 images"

zuul.d/docker-images/gerrit.yaml

@@ -127,6 +127,100 @@
     vars: *gerrit_vars_3_2
     files: *gerrit_files_3_2
 
+# Gerrit 3.3 jobs
+- job:
+    name: system-config-build-image-gerrit-3.3
+    description: Build a gerrit image.
+    parent: system-config-build-image
+    pre-run:
+      - playbooks/zuul/gerrit/repos.yaml
+      - playbooks/zuul/gerrit/submodules.yaml
+    run: playbooks/zuul/gerrit/run.yaml
+    requires: gerrit-base-container-image
+    provides: gerrit-3.3-container-image
+    required-projects: &gerrit_projects_3_3
+      - name: opendev/system-config
+        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
+      - name: gerrit.googlesource.com/plugins/commit-message-length-validator
+        override-checkout: v3.3.1
+      - name: gerrit.googlesource.com/plugins/hooks
+        override-checkout: v3.3.1
+      - name: gerrit.googlesource.com/plugins/its-base
+        # There is no 3.3 branch
+        override-checkout: master
+      - 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
+        override-checkout: v3.3.0
+      # Plugins common to every build without branches or refs for every build
+      - name: gerrit.googlesource.com/plugins/download-commands
+        override-checkout: v3.3.1
+      - name: gerrit.googlesource.com/plugins/singleusergroup
+        override-checkout: v3.3.1
+      # Plugins not common to every build
+      - name: gerrit.googlesource.com/plugins/codemirror-editor
+        override-checkout: v3.3.1
+      - name: gerrit.googlesource.com/plugins/delete-project
+        override-checkout: v3.3.1
+      - name: gerrit.googlesource.com/plugins/gitiles
+        override-checkout: stable-3.3
+      - name: gerrit.googlesource.com/plugins/plugin-manager
+        override-checkout: v3.3.1
+      - name: gerrit.googlesource.com/plugins/webhooks
+        override-checkout: v3.3.1
+      - name: gerrit.googlesource.com/plugins/zuul-results-summary
+        override-checkout: main
+      # Non plugin submodules
+      - name: gerrit.googlesource.com/jgit
+        override-checkout: master
+      - name: gerrit.googlesource.com/polymer-bridges
+        override-checkout: v3.3.1
+    vars: &gerrit_vars_3_3
+      docker_images:
+        - context: docker/gerrit/bazel
+          repository: opendevorg/gerrit
+          target: gerrit
+          path: /home/zuul/src/gerrit.googlesource.com/gerrit
+          tags:
+            - 3.3
+    files: &gerrit_files_3_3
+      - docker/gerrit/base/
+      - docker/gerrit/bazel/
+      - playbooks/zuul/gerrit/
+      - playbooks/test-review.yaml
+      - testinfra/test_gerrit.py
+      - jeepyb/
+
+- job:
+    name: system-config-upload-image-gerrit-3.3
+    description: Build and upload a gerrit image.
+    parent: system-config-upload-image
+    pre-run:
+      - playbooks/zuul/gerrit/repos.yaml
+      - playbooks/zuul/gerrit/submodules.yaml
+    run: playbooks/zuul/gerrit/run.yaml
+    requires: gerrit-base-container-image
+    provides: gerrit-3.3-container-image
+    required-projects: *gerrit_projects_3_3
+    vars: *gerrit_vars_3_3
+    files: *gerrit_files_3_3
+
+- job:
+    name: system-config-promote-image-gerrit-3.3
+    description: Promote a previously published gerrit image to latest.
+    parent: system-config-promote-image
+    vars: *gerrit_vars_3_3
+    files: *gerrit_files_3_3
+
 # Gerrit master jobs
 - job:
     name: system-config-build-image-gerrit-master-base
@@ -223,6 +317,11 @@
               - name: opendev-buildset-registry
               - name: system-config-build-image-gerrit-base
                 soft: true
+        - system-config-build-image-gerrit-3.3:
+            dependencies:
+              - name: opendev-buildset-registry
+              - name: system-config-build-image-gerrit-base
+                soft: true
         - system-config-build-image-gerrit-master:
             voting: false
             dependencies:
@@ -241,7 +340,13 @@
               - name: opendev-buildset-registry
               - name: system-config-upload-image-gerrit-base
                 soft: true
+        - system-config-upload-image-gerrit-3.3:
+            dependencies:
+              - name: opendev-buildset-registry
+              - name: system-config-upload-image-gerrit-base
+                soft: true
     deploy:
       jobs:
         - system-config-promote-image-gerrit-base
         - system-config-promote-image-gerrit-3.2
+        - system-config-promote-image-gerrit-3.3