diff --git a/docker/gerrit/base/Dockerfile b/docker/gerrit/base/Dockerfile index 6b9bfc7291..cd7a009e98 100644 --- a/docker/gerrit/base/Dockerfile +++ b/docker/gerrit/base/Dockerfile @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Mon Jan 31 16:37:15 UTC 2022 - trigger rebuild +# Thu Feb 3 15:58:11 UTC 2022 - trigger rebuild FROM docker.io/opendevorg/python-builder:3.9-bullseye as builder diff --git a/zuul.d/docker-images/gerrit.yaml b/zuul.d/docker-images/gerrit.yaml index 3acfecf903..ff15f1c568 100644 --- a/zuul.d/docker-images/gerrit.yaml +++ b/zuul.d/docker-images/gerrit.yaml @@ -130,6 +130,97 @@ vars: *gerrit_vars_3_4 files: *gerrit_files_3_4 +# 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.0.1 + - name: gerrit.googlesource.com/plugins/delete-project + override-checkout: stable-3.5 + - name: gerrit.googlesource.com/plugins/hooks + override-checkout: v3.5.0.1 + - name: gerrit.googlesource.com/plugins/its-base + # There is no 3.5 branch + override-checkout: master + - 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.0.1 + - name: gerrit.googlesource.com/plugins/replication + override-checkout: v3.5.0.1 + - name: gerrit.googlesource.com/plugins/reviewnotes + override-checkout: v3.5.0.1 + - name: gerrit.googlesource.com/plugins/singleusergroup + override-checkout: v3.5.0.1 + - 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.0.1 + - name: gerrit.googlesource.com/plugins/download-commands + override-checkout: v3.5.0.1 + - name: gerrit.googlesource.com/plugins/gitiles + override-checkout: v3.5.0.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.5.0.1 + 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 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.5: + 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.5: + 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.4 + - system-config-promote-image-gerrit-3.5 diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 6451a56034..d367040feb 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -65,6 +65,11 @@ - name: opendev-buildset-registry - name: system-config-build-image-gerrit-3.4 soft: true + - system-config-run-review-3.5: + dependencies: + - name: opendev-buildset-registry + - name: system-config-build-image-gerrit-3.5 + soft: true # TODO reenable when we have 3.5 images to upgrade to #- system-config-upgrade-review: # dependencies: @@ -219,6 +224,11 @@ - name: opendev-buildset-registry - name: system-config-upload-image-gerrit-3.4 soft: true + - system-config-run-review-3.5: + dependencies: + - name: opendev-buildset-registry + - name: system-config-upload-image-gerrit-3.5 + 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 b1eb5dfd37..88a2e9b35f 100644 --- a/zuul.d/system-config-run.yaml +++ b/zuul.d/system-config-run.yaml @@ -961,6 +961,15 @@ vars: zuul_test_gerrit_version: '3.4' +- job: + name: system-config-run-review-3.5 + parent: system-config-run-review-base + description: | + Run the playbook for gerrit 3.5 (in a container). + requires: gerrit-3.4-container-image + vars: + zuul_test_gerrit_version: '3.5' + # TODO reenable this job when we have 3.5 images to upgrade to. #- job: # name: system-config-upgrade-review