Merge "Put gerrit image jobs into a project-template"

.zuul.yaml

@@ -193,6 +193,7 @@
     files: &gerrit_files_2_13
       - docker/gerrit/base/.*
       - docker/gerrit/2.13/.*
+      - jeepyb/*
 
 - job:
     name: system-config-upload-image-gerrit-2.13
@@ -251,6 +252,7 @@
       - docker/gerrit/base/.*
       - docker/gerrit/bazel/.*
       - playbooks/zuul/gerrit/.*
+      - jeepyb/*
 
 - job:
     name: system-config-upload-image-gerrit-2.15
@@ -316,6 +318,7 @@
       - docker/gerrit/base/.*
       - docker/gerrit/bazel/.*
       - playbooks/zuul/gerrit/.*
+      - jeepyb/*
 
 - job:
     name: system-config-upload-image-gerrit-2.16
@@ -393,6 +396,7 @@
       - docker/gerrit/base/.*
       - docker/gerrit/bazel/.*
       - playbooks/zuul/gerrit/.*
+      - jeepyb/*
 
 - job:
     name: system-config-upload-image-gerrit-3.0
@@ -474,6 +478,7 @@
       - docker/gerrit/base/.*
       - docker/gerrit/bazel/.*
       - playbooks/zuul/gerrit/.*
+      - jeepyb/*
 
 - job:
     name: system-config-upload-image-gerrit-master
@@ -1293,9 +1298,84 @@
     vars:
       goaccess_site: zuul-ci.org
 
+- project-template:
+    name: system-config-gerrit-images
+    check:
+      jobs:
+        - system-config-build-image-gerrit-base:
+            dependencies:
+              - name: opendev-buildset-registry
+              - name: system-config-build-image-python-builder
+                soft: true
+        - system-config-build-image-gerrit-2.13:
+            dependencies:
+              - name: opendev-buildset-registry
+              - name: system-config-build-image-python-builder
+                soft: true
+              - name: system-config-build-image-gerrit-base
+                soft: true
+        - system-config-build-image-gerrit-2.15:
+            dependencies:
+              - name: opendev-buildset-registry
+              - name: system-config-build-image-gerrit-base
+                soft: true
+        - system-config-build-image-gerrit-2.16:
+            dependencies:
+              - name: opendev-buildset-registry
+              - name: system-config-build-image-gerrit-base
+                soft: true
+        - system-config-build-image-gerrit-3.0:
+            dependencies:
+              - name: opendev-buildset-registry
+              - name: system-config-build-image-gerrit-base
+                soft: true
+        - system-config-build-image-gerrit-master:
+            voting: false
+            dependencies:
+              - name: opendev-buildset-registry
+              - name: system-config-build-image-gerrit-base
+                soft: true
+    gate:
+      jobs:
+        - system-config-upload-image-gerrit-base:
+            dependencies:
+              - name: opendev-buildset-registry
+              - name: system-config-upload-image-python-builder
+                soft: true
+        - system-config-upload-image-gerrit-2.13:
+            dependencies:
+              - name: opendev-buildset-registry
+              - name: system-config-upload-image-python-builder
+                soft: true
+              - name: system-config-upload-image-gerrit-base
+                soft: true
+        - system-config-upload-image-gerrit-2.15:
+            dependencies:
+              - name: opendev-buildset-registry
+              - name: system-config-upload-image-gerrit-base
+                soft: true
+        - system-config-upload-image-gerrit-2.16:
+            dependencies:
+              - name: opendev-buildset-registry
+              - name: system-config-upload-image-gerrit-base
+                soft: true
+        - system-config-upload-image-gerrit-3.0:
+            dependencies:
+              - name: opendev-buildset-registry
+              - name: system-config-upload-image-gerrit-base
+                soft: true
+    promote:
+      jobs:
+        - system-config-promote-image-gerrit-base
+        - system-config-promote-image-gerrit-2.13
+        - system-config-promote-image-gerrit-2.15
+        - system-config-promote-image-gerrit-2.16
+        - system-config-promote-image-gerrit-3.0
+
 - project:
     templates:
       - system-config-zuul-role-integration
+      - system-config-gerrit-images
       - infra-puppet-apply-jobs
       - infra-logstash-filter-jobs
       - publish-tox-docs-infra
@@ -1343,39 +1423,6 @@
               - name: system-config-build-image-jinja-init
                 soft: true
         - system-config-build-image-gitea
-        - system-config-build-image-gerrit-base:
-            dependencies:
-              - name: opendev-buildset-registry
-              - name: system-config-build-image-python-builder
-                soft: true
-        - system-config-build-image-gerrit-2.13:
-            dependencies:
-              - name: opendev-buildset-registry
-              - name: system-config-build-image-python-builder
-                soft: true
-              - name: system-config-build-image-gerrit-base
-                soft: true
-        - system-config-build-image-gerrit-2.15:
-            dependencies:
-              - name: opendev-buildset-registry
-              - name: system-config-build-image-gerrit-base
-                soft: true
-        - system-config-build-image-gerrit-2.16:
-            dependencies:
-              - name: opendev-buildset-registry
-              - name: system-config-build-image-gerrit-base
-                soft: true
-        - system-config-build-image-gerrit-3.0:
-            dependencies:
-              - name: opendev-buildset-registry
-              - name: system-config-build-image-gerrit-base
-                soft: true
-        - system-config-build-image-gerrit-master:
-            voting: false
-            dependencies:
-              - name: opendev-buildset-registry
-              - name: system-config-build-image-gerrit-base
-                soft: true
         - system-config-build-image-haproxy-statsd:
             dependencies:
               - name: opendev-buildset-registry
@@ -1427,33 +1474,6 @@
               - name: system-config-upload-image-jinja-init
                 soft: true
         - system-config-upload-image-gitea
-        - system-config-upload-image-gerrit-base:
-            dependencies:
-              - name: opendev-buildset-registry
-              - name: system-config-upload-image-python-builder
-                soft: true
-        - system-config-upload-image-gerrit-2.13:
-            dependencies:
-              - name: opendev-buildset-registry
-              - name: system-config-upload-image-python-builder
-                soft: true
-              - name: system-config-upload-image-gerrit-base
-                soft: true
-        - system-config-upload-image-gerrit-2.15:
-            dependencies:
-              - name: opendev-buildset-registry
-              - name: system-config-upload-image-gerrit-base
-                soft: true
-        - system-config-upload-image-gerrit-2.16:
-            dependencies:
-              - name: opendev-buildset-registry
-              - name: system-config-upload-image-gerrit-base
-                soft: true
-        - system-config-upload-image-gerrit-3.0:
-            dependencies:
-              - name: opendev-buildset-registry
-              - name: system-config-upload-image-gerrit-base
-                soft: true
         - system-config-upload-image-haproxy-statsd:
             dependencies:
               - name: opendev-buildset-registry
@@ -1466,11 +1486,6 @@
         - system-config-promote-image-jinja-init
         - system-config-promote-image-gitea-init
         - system-config-promote-image-gitea
-        - system-config-promote-image-gerrit-base
-        - system-config-promote-image-gerrit-2.13
-        - system-config-promote-image-gerrit-2.15
-        - system-config-promote-image-gerrit-2.16
-        - system-config-promote-image-gerrit-3.0
         - system-config-promote-image-haproxy-statsd
         - system-config-promote-image-python-base
         - system-config-promote-image-python-builder