From 400514a1b6852113dbac473168554e6aa520bbf2 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Fri, 31 May 2024 14:41:54 -0700 Subject: [PATCH] Add Gerrit 3.10 image builds and testing This adds Gerrit 3.10 image builds and our system-config-run-gerrit jobs for Gerrit 3.10. Change-Id: I6525090f78a1f1440f2cccda96f83158cb08d2ac --- docker/gerrit/base/Dockerfile | 2 +- zuul.d/docker-images/gerrit.yaml | 104 +++++++++++++++++++++++++++++++ zuul.d/project.yaml | 10 +++ zuul.d/system-config-run.yaml | 9 +++ 4 files changed, 124 insertions(+), 1 deletion(-) diff --git a/docker/gerrit/base/Dockerfile b/docker/gerrit/base/Dockerfile index 78d787b1ad..cae850c65d 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. -# Tue May 21 04:45:30 PM UTC 2024 - trigger rebuild +# Mon Jun 3 05:26:49 PM UTC 2024 - trigger rebuild FROM docker.io/opendevorg/python-builder:3.11-bookworm as builder diff --git a/zuul.d/docker-images/gerrit.yaml b/zuul.d/docker-images/gerrit.yaml index 6e29ed71f0..e7c1cb3841 100644 --- a/zuul.d/docker-images/gerrit.yaml +++ b/zuul.d/docker-images/gerrit.yaml @@ -137,6 +137,99 @@ vars: *gerrit_vars_3_9 files: *gerrit_files_3_9 +# Gerrit 3.10 jobs +- job: + name: system-config-build-image-gerrit-3.10 + 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.10-container-image + required-projects: &gerrit_projects_3_10 + - name: opendev/system-config + override-checkout: master + - name: gerrit.googlesource.com/gerrit + override-checkout: stable-3.10 + # Backend behavior plugins + - name: gerrit.googlesource.com/plugins/commit-message-length-validator + override-checkout: v3.10.0 + - name: gerrit.googlesource.com/plugins/delete-project + override-checkout: v3.10.0 + - name: gerrit.googlesource.com/plugins/hooks + override-checkout: v3.10.0 + - name: gerrit.googlesource.com/plugins/its-base + # There is no 3.10 branch + override-checkout: master + - name: gerrit.googlesource.com/plugins/its-storyboard + # There is no 3.10 branch + override-checkout: master + - name: gerrit.googlesource.com/plugins/plugin-manager + override-checkout: v3.10.0 + - name: gerrit.googlesource.com/plugins/replication + override-checkout: v3.10.0 + - name: gerrit.googlesource.com/plugins/reviewnotes + override-checkout: v3.10.0 + - name: gerrit.googlesource.com/plugins/singleusergroup + override-checkout: v3.10.0 + - name: gerrit.googlesource.com/plugins/webhooks + override-checkout: v3.10.0 + # UI behavior plugins + - name: gerrit.googlesource.com/plugins/codemirror-editor + override-checkout: v3.10.0 + - name: gerrit.googlesource.com/plugins/download-commands + override-checkout: v3.10.0 + - name: gerrit.googlesource.com/plugins/gitiles + override-checkout: v3.10.0 + - name: gerrit.googlesource.com/plugins/zuul-results-summary + override-checkout: main + # Non plugin submodules + - name: gerrit.googlesource.com/java-prettify + override-checkout: master + - name: gerrit.googlesource.com/jgit + override-checkout: master + - name: gerrit.googlesource.com/polymer-bridges + override-checkout: v3.10.0 + vars: &gerrit_vars_3_10 + docker_images: + - context: docker/gerrit/bazel + repository: opendevorg/gerrit + target: gerrit + path: /home/zuul/src/gerrit.googlesource.com/gerrit + tags: + - '3.10' + files: &gerrit_files_3_10 + - 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.10 + 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.10-container-image + required-projects: *gerrit_projects_3_10 + vars: *gerrit_vars_3_10 + files: *gerrit_files_3_10 + +- job: + name: system-config-promote-image-gerrit-3.10 + description: Promote a previously published gerrit image to latest. + parent: system-config-promote-image + vars: *gerrit_vars_3_10 + files: *gerrit_files_3_10 + # Gerrit master jobs - job: name: system-config-build-image-gerrit-master-base @@ -237,6 +330,11 @@ - name: opendev-buildset-registry - name: system-config-build-image-gerrit-base soft: true + - system-config-build-image-gerrit-3.10: + dependencies: + - name: opendev-buildset-registry + - name: system-config-build-image-gerrit-base + soft: true - system-config-build-image-gerrit-master: voting: false dependencies: @@ -255,7 +353,13 @@ - name: opendev-buildset-registry - name: system-config-upload-image-gerrit-base soft: true + - system-config-upload-image-gerrit-3.10: + 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.9 + - system-config-promote-image-gerrit-3.10 diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 8c8c6c6b26..1ba17911b9 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -68,6 +68,11 @@ - name: opendev-buildset-registry - name: system-config-build-image-gerrit-3.9 soft: true + - system-config-run-review-3.10: + dependencies: + - name: opendev-buildset-registry + - name: system-config-build-image-gerrit-3.10 + soft: true # Temporarily disabled until we have 3.10 images and # perform a 3.9 -> 3.10 upgrade test. #- system-config-upgrade-review: @@ -226,6 +231,11 @@ - name: opendev-buildset-registry - name: system-config-upload-image-gerrit-3.9 soft: true + - system-config-run-review-3.10: + dependencies: + - name: opendev-buildset-registry + - name: system-config-upload-image-gerrit-3.10 + 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 8750127fa2..c37689a1c6 100644 --- a/zuul.d/system-config-run.yaml +++ b/zuul.d/system-config-run.yaml @@ -1092,6 +1092,15 @@ vars: zuul_test_gerrit_version: '3.9' +- job: + name: system-config-run-review-3.10 + parent: system-config-run-review-base + description: | + Run the playbook for gerrit 3.10 (in a container). + requires: gerrit-3.10-container-image + vars: + zuul_test_gerrit_version: '3.10' + # Temporarily disabled until we have 3.10 images and # perform a 3.9 -> 3.10 upgrade test. #- job: