
This was missed in the effort to push out Gerrit 3.5.3 as well as the ssh rsa sha2 fixes. That said it should be mostly fine as all of the plugins tagged 3.5.2 have tagged the same commit with 3.5.3. Making this largely a bookkeeping change. There is one bit that isn't strictly bookkeeping and that is the plugins/its-base checkout. Against gerrit 3.5 we convert from a master checkout [0] to a stable-3.5 [1] checkout as this branch exists now. Against gerrit 3.6 we convert from a stable-3.6 checkout to a master checkout. I suspect that a stable-3.6 branch existed for a short period of time and was cleaned up and zuul is using an old cached state. The change for its-base on gerrit 3.5 does represent a reversion of three commits but they all seem related to gerrit 3.6 so I expect this is fine. [0] https://gerrit.googlesource.com/plugins/its-base/+log/refs/heads/master [1] https://gerrit.googlesource.com/plugins/its-base/+log/refs/heads/stable-3.5 Change-Id: I619b28fe642ca8b57eb533157ec0a441f6b66890
354 lines
13 KiB
YAML
354 lines
13 KiB
YAML
# gerrit-base jobs
|
|
- job:
|
|
name: system-config-build-image-gerrit-base
|
|
description: Build a gerrit-base image.
|
|
parent: system-config-build-image
|
|
required-projects: &gerrit_base_projects
|
|
- opendev/jeepyb
|
|
- opendev/system-config
|
|
requires: python-builder-3.9-bullseye-container-image
|
|
provides: gerrit-base-container-image
|
|
pre-run: &gerrit-base_prerun
|
|
- playbooks/zuul/gerrit/base.yaml
|
|
vars: &gerrit-base_vars
|
|
docker_images:
|
|
- context: docker/gerrit/base
|
|
repository: opendevorg/gerrit-base
|
|
path: /home/zuul/src/opendev.org/opendev/jeepyb
|
|
files: &gerrit-base_files
|
|
- docker/gerrit/base/
|
|
- roles/bazelisk-build/
|
|
- playbooks/zuul/gerrit/
|
|
|
|
- job:
|
|
name: system-config-upload-image-gerrit-base
|
|
description: Build and upload a gerrit-base image.
|
|
parent: system-config-upload-image
|
|
requires: python-builder-3.9-bullseye-container-image
|
|
provides: gerrit-base-container-image
|
|
pre-run: *gerrit-base_prerun
|
|
required-projects: *gerrit_base_projects
|
|
vars: *gerrit-base_vars
|
|
files: *gerrit-base_files
|
|
|
|
- job:
|
|
name: system-config-promote-image-gerrit-base
|
|
description: Promote a previously published gerrit-base image to latest.
|
|
parent: system-config-promote-image
|
|
required-projects: *gerrit_base_projects
|
|
vars: *gerrit-base_vars
|
|
files: *gerrit-base_files
|
|
|
|
# Gerrit 3.5 jobs
|
|
- job:
|
|
name: system-config-build-image-gerrit-3.5
|
|
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.5-container-image
|
|
required-projects: &gerrit_projects_3_5
|
|
- name: opendev/system-config
|
|
override-checkout: master
|
|
- name: gerrit.googlesource.com/gerrit
|
|
override-checkout: stable-3.5
|
|
# Backend behavior plugins
|
|
- name: gerrit.googlesource.com/plugins/commit-message-length-validator
|
|
override-checkout: v3.5.3
|
|
- name: gerrit.googlesource.com/plugins/delete-project
|
|
override-checkout: stable-3.5
|
|
- name: gerrit.googlesource.com/plugins/hooks
|
|
override-checkout: v3.5.3
|
|
- name: gerrit.googlesource.com/plugins/its-base
|
|
override-checkout: stable-3.5
|
|
- name: gerrit.googlesource.com/plugins/its-storyboard
|
|
# There is no 3.5 branch
|
|
override-checkout: master
|
|
- name: gerrit.googlesource.com/plugins/plugin-manager
|
|
override-checkout: v3.5.3
|
|
- name: gerrit.googlesource.com/plugins/replication
|
|
override-checkout: stable-3.5
|
|
- name: gerrit.googlesource.com/plugins/reviewnotes
|
|
override-checkout: v3.5.3
|
|
- name: gerrit.googlesource.com/plugins/singleusergroup
|
|
override-checkout: v3.5.3
|
|
- name: gerrit.googlesource.com/plugins/webhooks
|
|
override-checkout: stable-3.5
|
|
# UI behavior plugins
|
|
- name: gerrit.googlesource.com/plugins/codemirror-editor
|
|
override-checkout: v3.5.3
|
|
- name: gerrit.googlesource.com/plugins/download-commands
|
|
override-checkout: v3.5.3
|
|
- name: gerrit.googlesource.com/plugins/gitiles
|
|
override-checkout: stable-3.5
|
|
- 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.5.3
|
|
vars: &gerrit_vars_3_5
|
|
docker_images:
|
|
- context: docker/gerrit/bazel
|
|
repository: opendevorg/gerrit
|
|
target: gerrit
|
|
path: /home/zuul/src/gerrit.googlesource.com/gerrit
|
|
tags:
|
|
- 3.5
|
|
files: &gerrit_files_3_5
|
|
- 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.5
|
|
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.5-container-image
|
|
required-projects: *gerrit_projects_3_5
|
|
vars: *gerrit_vars_3_5
|
|
files: *gerrit_files_3_5
|
|
|
|
- job:
|
|
name: system-config-promote-image-gerrit-3.5
|
|
description: Promote a previously published gerrit image to latest.
|
|
parent: system-config-promote-image
|
|
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.2
|
|
- name: gerrit.googlesource.com/plugins/delete-project
|
|
override-checkout: v3.6.2
|
|
- name: gerrit.googlesource.com/plugins/hooks
|
|
override-checkout: v3.6.2
|
|
- name: gerrit.googlesource.com/plugins/its-base
|
|
# There is no 3.6 branch
|
|
override-checkout: master
|
|
- 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.2
|
|
- name: gerrit.googlesource.com/plugins/replication
|
|
override-checkout: v3.6.2
|
|
- name: gerrit.googlesource.com/plugins/reviewnotes
|
|
override-checkout: v3.6.2
|
|
- name: gerrit.googlesource.com/plugins/singleusergroup
|
|
override-checkout: v3.6.2
|
|
- name: gerrit.googlesource.com/plugins/webhooks
|
|
override-checkout: v3.6.2
|
|
# UI behavior plugins
|
|
- name: gerrit.googlesource.com/plugins/codemirror-editor
|
|
override-checkout: v3.6.2
|
|
- name: gerrit.googlesource.com/plugins/download-commands
|
|
override-checkout: v3.6.2
|
|
- name: gerrit.googlesource.com/plugins/gitiles
|
|
override-checkout: v3.6.2
|
|
- 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.2
|
|
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
|
|
description: |
|
|
Build a gerrit image.
|
|
|
|
This job has no files matchers so it can be used in other repos.
|
|
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-master-container-image
|
|
required-projects: &gerrit_projects_master
|
|
- opendev/system-config
|
|
- gerrit.googlesource.com/gerrit
|
|
# Backend behavior plugins
|
|
- gerrit.googlesource.com/plugins/commit-message-length-validator
|
|
- gerrit.googlesource.com/plugins/delete-project
|
|
- gerrit.googlesource.com/plugins/hooks
|
|
- gerrit.googlesource.com/plugins/its-base
|
|
- gerrit.googlesource.com/plugins/its-storyboard
|
|
- gerrit.googlesource.com/plugins/plugin-manager
|
|
- gerrit.googlesource.com/plugins/replication
|
|
- 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
|
|
docker_images:
|
|
- context: docker/gerrit/bazel
|
|
repository: opendevorg/gerrit
|
|
target: gerrit
|
|
path: /home/zuul/src/gerrit.googlesource.com/gerrit
|
|
tags:
|
|
- master
|
|
gerrit_additional_plugins:
|
|
- checks
|
|
|
|
- job:
|
|
name: system-config-build-image-gerrit-master
|
|
description: |
|
|
Build a gerrit image.
|
|
|
|
This job is used in system-config.
|
|
parent: system-config-build-image-gerrit-master-base
|
|
files: &gerrit_files_master
|
|
- docker/gerrit/base/
|
|
- docker/gerrit/bazel/
|
|
- playbooks/zuul/gerrit/
|
|
- jeepyb/
|
|
- roles/bazelisk-build/
|
|
|
|
- job:
|
|
name: system-config-upload-image-gerrit-master
|
|
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-master-container-image
|
|
required-projects: *gerrit_projects_master
|
|
vars: *gerrit_vars_master
|
|
files: *gerrit_files_master
|
|
|
|
- job:
|
|
name: system-config-promote-image-gerrit-master
|
|
description: Promote a previously published gerrit image to latest.
|
|
parent: system-config-promote-image
|
|
vars: *gerrit_vars_master
|
|
files: *gerrit_files_master
|
|
|
|
- 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-3.9-bullseye
|
|
soft: true
|
|
- system-config-build-image-gerrit-3.5:
|
|
dependencies:
|
|
- 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:
|
|
- 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-3.9-bullseye
|
|
soft: true
|
|
- system-config-upload-image-gerrit-3.5:
|
|
dependencies:
|
|
- 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
|