diff --git a/zuul.d/docker-images/gerrit.yaml b/zuul.d/docker-images/gerrit.yaml index 894e83918e..07b3dd0b14 100644 --- a/zuul.d/docker-images/gerrit.yaml +++ b/zuul.d/docker-images/gerrit.yaml @@ -228,6 +228,101 @@ vars: *gerrit_vars_3_3 files: *gerrit_files_3_3 +# Gerrit 3.4 jobs +- job: + name: system-config-build-image-gerrit-3.4 + 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.4-container-image + required-projects: &gerrit_projects_3_4 + - name: opendev/system-config + override-checkout: master + - name: gerrit.googlesource.com/gerrit + override-checkout: stable-3.4 + # Plugins common to every build with branches or refs for every build + - name: gerrit.googlesource.com/plugins/commit-message-length-validator + override-checkout: v3.4.1 + - name: gerrit.googlesource.com/plugins/hooks + override-checkout: v3.4.1 + - name: gerrit.googlesource.com/plugins/its-base + # There is no 3.4 branch + override-checkout: master + - name: gerrit.googlesource.com/plugins/its-storyboard + # There is no 3.4 branch + override-checkout: master + - name: gerrit.googlesource.com/plugins/javamelody + # There is no 3.4 branch + override-checkout: master + - name: gerrit.googlesource.com/plugins/replication + override-checkout: stable-3.4 + - name: gerrit.googlesource.com/plugins/reviewnotes + override-checkout: v3.4.1 + # Plugins common to every build without branches or refs for every build + - name: gerrit.googlesource.com/plugins/download-commands + override-checkout: v3.4.1 + - name: gerrit.googlesource.com/plugins/singleusergroup + override-checkout: v3.4.1 + # Plugins not common to every build + - name: gerrit.googlesource.com/plugins/codemirror-editor + override-checkout: stable-3.4 + - name: gerrit.googlesource.com/plugins/delete-project + override-checkout: v3.4.1 + - name: gerrit.googlesource.com/plugins/gitiles + override-checkout: stable-3.4 + - name: gerrit.googlesource.com/plugins/plugin-manager + override-checkout: v3.4.1 + - name: gerrit.googlesource.com/plugins/webhooks + override-checkout: v3.4.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.4.1 + vars: &gerrit_vars_3_4 + docker_images: + - context: docker/gerrit/bazel + repository: opendevorg/gerrit + target: gerrit + path: /home/zuul/src/gerrit.googlesource.com/gerrit + tags: + - 3.4 + files: &gerrit_files_3_4 + - 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.4 + 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.4-container-image + required-projects: *gerrit_projects_3_4 + vars: *gerrit_vars_3_4 + files: *gerrit_files_3_4 + +- job: + name: system-config-promote-image-gerrit-3.4 + description: Promote a previously published gerrit image to latest. + parent: system-config-promote-image + vars: *gerrit_vars_3_4 + files: *gerrit_files_3_4 + # Gerrit master jobs - job: name: system-config-build-image-gerrit-master-base @@ -330,6 +425,11 @@ - name: opendev-buildset-registry - name: system-config-build-image-gerrit-base soft: true + - system-config-build-image-gerrit-3.4: + dependencies: + - name: opendev-buildset-registry + - name: system-config-build-image-gerrit-base + soft: true - system-config-build-image-gerrit-master: voting: false dependencies: @@ -353,8 +453,14 @@ - name: opendev-buildset-registry - name: system-config-upload-image-gerrit-base soft: true + - system-config-upload-image-gerrit-3.4: + 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 + - system-config-promote-image-gerrit-3.4 diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 8bf8d27890..569717dd68 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -71,6 +71,11 @@ - name: opendev-buildset-registry - name: system-config-build-image-gerrit-3.3 soft: true + - system-config-run-review-3.4: + dependencies: + - name: opendev-buildset-registry + - name: system-config-build-image-gerrit-3.4 + soft: true - system-config-upgrade-review: dependencies: - name: opendev-buildset-registry @@ -231,6 +236,11 @@ - name: opendev-buildset-registry - name: system-config-upload-image-gerrit-3.3 soft: true + - system-config-run-review-3.4: + dependencies: + - name: opendev-buildset-registry + - name: system-config-upload-image-gerrit-3.4 + soft: true - system-config-run-refstack: dependencies: - name: opendev-buildset-registry diff --git a/zuul.d/system-config-run.yaml b/zuul.d/system-config-run.yaml index bc4db9d60d..520328a236 100644 --- a/zuul.d/system-config-run.yaml +++ b/zuul.d/system-config-run.yaml @@ -905,6 +905,15 @@ vars: zuul_test_gerrit_version: '3.3' +- job: + name: system-config-run-review-3.4 + parent: system-config-run-review-base + description: | + Run the playbook for gerrit 3.4 (in a container). + requires: gerrit-3.4-container-image + vars: + zuul_test_gerrit_version: '3.4' + - job: name: system-config-upgrade-review parent: system-config-run-review-base