From 4fcf044aa1a998a39c615cff02c78aaa104981f6 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Sun, 22 Mar 2020 09:29:09 -0500 Subject: [PATCH] Put gerrit image jobs into a project-template We need to run these on jeepyb patches since we're including jeepyb into gerrit images. We also need to add jeepyb/* to the file matchers of the jobs. Change-Id: I4479b5cef44d3c17d5c5d9412e6c1f127bf699e3 --- .zuul.yaml | 145 +++++++++++++++++++++++++++++------------------------ 1 file changed, 80 insertions(+), 65 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 3aa9e81492..ca93faffb3 100644 --- a/.zuul.yaml +++ b/.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 @@ -1281,9 +1286,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 @@ -1328,39 +1408,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: system-config-build-image-python-base @@ -1408,33 +1455,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: system-config-upload-image-python-base @@ -1446,11 +1466,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