Add Gerrit 3.6 jobs

This adds Gerrit 3.6 image build jobs as well as CI testing for this
version of Gerrit. Once we've got images that build and function
generally we'll reenable the upgrade job and work through that.

Change-Id: I494a21911a2279228e57ff8d2b731b06a1573438

zuul.d/docker-images/gerrit.yaml

@@ -130,6 +130,97 @@
     vars: *gerrit_vars_3_5
     files: *gerrit_files_3_5
 
+# Gerrit 3.6 jobs
+- job:
+    name: system-config-build-image-gerrit-3.6
+    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.6-container-image
+    required-projects: &gerrit_projects_3_6
+      - name: opendev/system-config
+        override-checkout: master
+      - name: gerrit.googlesource.com/gerrit
+        override-checkout: stable-3.6
+      # Backend behavior plugins
+      - name: gerrit.googlesource.com/plugins/commit-message-length-validator
+        override-checkout: v3.6.1
+      - name: gerrit.googlesource.com/plugins/delete-project
+        override-checkout: v3.6.1
+      - name: gerrit.googlesource.com/plugins/hooks
+        override-checkout: v3.6.1
+      - name: gerrit.googlesource.com/plugins/its-base
+        # There is no 3.6 branch
+        override-checkout: stable-3.6
+      - name: gerrit.googlesource.com/plugins/its-storyboard
+        # There is no 3.6 branch
+        override-checkout: master
+      - name: gerrit.googlesource.com/plugins/plugin-manager
+        override-checkout: v3.6.1
+      - name: gerrit.googlesource.com/plugins/replication
+        override-checkout: v3.6.1
+      - name: gerrit.googlesource.com/plugins/reviewnotes
+        override-checkout: v3.6.1
+      - name: gerrit.googlesource.com/plugins/singleusergroup
+        override-checkout: v3.6.1
+      - name: gerrit.googlesource.com/plugins/webhooks
+        override-checkout: v3.6.1
+      # UI behavior plugins
+      - name: gerrit.googlesource.com/plugins/codemirror-editor
+        override-checkout: v3.6.1
+      - name: gerrit.googlesource.com/plugins/download-commands
+        override-checkout: v3.6.1
+      - name: gerrit.googlesource.com/plugins/gitiles
+        override-checkout: v3.6.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.6.1
+    vars: &gerrit_vars_3_6
+      docker_images:
+        - context: docker/gerrit/bazel
+          repository: opendevorg/gerrit
+          target: gerrit
+          path: /home/zuul/src/gerrit.googlesource.com/gerrit
+          tags:
+            - 3.6
+    files: &gerrit_files_3_6
+      - docker/gerrit/base/
+      - docker/gerrit/bazel/
+      - playbooks/zuul/gerrit/
+      - playbooks/test-review.yaml
+      - testinfra/test_gerrit.py
+      - jeepyb/
+      - roles/bazelisk-build/
+
+- job:
+    name: system-config-upload-image-gerrit-3.6
+    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.6-container-image
+    required-projects: *gerrit_projects_3_6
+    vars: *gerrit_vars_3_6
+    files: *gerrit_files_3_6
+
+- job:
+    name: system-config-promote-image-gerrit-3.6
+    description: Promote a previously published gerrit image to latest.
+    parent: system-config-promote-image
+    vars: *gerrit_vars_3_6
+    files: *gerrit_files_3_6
+
 # Gerrit master jobs
 - job:
     name: system-config-build-image-gerrit-master-base
@@ -228,6 +319,11 @@
               - name: opendev-buildset-registry
               - name: system-config-build-image-gerrit-base
                 soft: true
+        - system-config-build-image-gerrit-3.6:
+            dependencies:
+              - name: opendev-buildset-registry
+              - name: system-config-build-image-gerrit-base
+                soft: true
         - system-config-build-image-gerrit-master:
             voting: false
             dependencies:
@@ -246,7 +342,13 @@
               - name: opendev-buildset-registry
               - name: system-config-upload-image-gerrit-base
                 soft: true
+        - system-config-upload-image-gerrit-3.6:
+            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.5
+        - system-config-promote-image-gerrit-3.6

zuul.d/project.yaml

@@ -65,6 +65,11 @@
               - name: opendev-buildset-registry
               - name: system-config-build-image-gerrit-3.5
                 soft: true
+        - system-config-run-review-3.6:
+            dependencies:
+              - name: opendev-buildset-registry
+              - name: system-config-build-image-gerrit-3.6
+                soft: true
         # Temporarily disabled until we have 3.6 images to perform
         # a 3.5 -> 3.6 upgrade.
         #- system-config-upgrade-review:
@@ -211,6 +216,11 @@
               - name: opendev-buildset-registry
               - name: system-config-upload-image-gerrit-3.5
                 soft: true
+        - system-config-run-review-3.6:
+            dependencies:
+              - name: opendev-buildset-registry
+              - name: system-config-upload-image-gerrit-3.6
+                soft: true
         - system-config-run-refstack:
             dependencies:
               - name: opendev-buildset-registry

zuul.d/system-config-run.yaml

@@ -967,10 +967,19 @@
     parent: system-config-run-review-base
     description: |
       Run the playbook for gerrit 3.5 (in a container).
-    requires: gerrit-3.4-container-image
+    requires: gerrit-3.5-container-image
     vars:
       zuul_test_gerrit_version: '3.5'
 
+- job:
+    name: system-config-run-review-3.6
+    parent: system-config-run-review-base
+    description: |
+      Run the playbook for gerrit 3.6 (in a container).
+    requires: gerrit-3.6-container-image
+    vars:
+      zuul_test_gerrit_version: '3.6'
+
 - job:
     name: system-config-upgrade-review
     parent: system-config-run-review-base