From 0d5657166220b80928ed57e7f515fa7bff9f44f4 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Mon, 8 Dec 2025 09:16:16 -0800 Subject: [PATCH] Drop Gerrit 3.10 image builds We've upgraded to Gerrit 3.11. Once we're comfortable that we are unlikely to rollback to 3.10 we should drop the image builds and testing for 3.10. We do this as it is no longer necessary, but also beacuse we want to rebuild 3.11 on Debian Trixie with Java 21 and don't want to figure that out for Gerrit 3.10 as well. A followup to this change will be converting the Gerrit image builds to Trixie and Java 21, then we can add Gerrit 3.12 images and testing. Change-Id: I7686e4174a20bfc4076a2f55783f0fc834368c48 --- zuul.d/docker-images/gerrit.yaml | 113 ------------------------------- zuul.d/project.yaml | 24 ++----- zuul.d/system-config-run.yaml | 37 ++++------ 3 files changed, 21 insertions(+), 153 deletions(-) diff --git a/zuul.d/docker-images/gerrit.yaml b/zuul.d/docker-images/gerrit.yaml index a8010d9253..7d23ec4ad9 100644 --- a/zuul.d/docker-images/gerrit.yaml +++ b/zuul.d/docker-images/gerrit.yaml @@ -53,108 +53,6 @@ vars: *gerrit-base_vars files: *gerrit-base_files -# Gerrit 3.10 jobs -- job: - name: system-config-build-image-gerrit-3.10 - description: Build a gerrit image. - parent: system-config-build-container-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.9 - - name: gerrit.googlesource.com/plugins/delete-project - override-checkout: v3.10.9 - - name: gerrit.googlesource.com/plugins/hooks - override-checkout: v3.10.9 - - 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.9 - - name: gerrit.googlesource.com/plugins/replication - override-checkout: v3.10.9 - - name: gerrit.googlesource.com/plugins/reviewnotes - override-checkout: v3.10.9 - - name: gerrit.googlesource.com/plugins/singleusergroup - override-checkout: v3.10.9 - - name: gerrit.googlesource.com/plugins/webhooks - override-checkout: v3.10.9 - # UI behavior plugins - - name: gerrit.googlesource.com/plugins/codemirror-editor - override-checkout: v3.10.9 - - name: gerrit.googlesource.com/plugins/download-commands - override-checkout: v3.10.9 - - name: gerrit.googlesource.com/plugins/gitiles - override-checkout: v3.10.9 - - 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.9 - vars: &gerrit_vars_3_10 - promote_container_image_job: system-config-upload-image-gerrit-3.10 - container_command: docker - container_images: - - context: docker/gerrit/bazel - registry: quay.io - repository: quay.io/opendevorg/gerrit - namespace: opendevorg - repo_shortname: gerrit - repo_description: > - A Gerrit image used by the OpenDev collaboratory to run its - production instance of Gerrit - target: gerrit - path: /home/zuul/src/gerrit.googlesource.com/gerrit - container_filename: Dockerfile - 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-container-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-container-image - vars: *gerrit_vars_3_10 - files: *gerrit_files_3_10 - # Gerrit 3.11 jobs - job: name: system-config-build-image-gerrit-3.11 @@ -363,11 +261,6 @@ soft: true - name: system-config-build-image-python-base-3.12-bookworm 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-3.11: dependencies: - name: opendev-buildset-registry @@ -388,11 +281,6 @@ soft: true - name: system-config-upload-image-python-base-3.12-bookworm soft: true - - system-config-upload-image-gerrit-3.10: - dependencies: - - name: opendev-buildset-registry - - name: system-config-upload-image-gerrit-base - soft: true - system-config-upload-image-gerrit-3.11: dependencies: - name: opendev-buildset-registry @@ -401,5 +289,4 @@ deploy: jobs: - system-config-promote-image-gerrit-base - - system-config-promote-image-gerrit-3.10 - system-config-promote-image-gerrit-3.11 diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 28d3fa3f42..457ca16764 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -57,23 +57,18 @@ - name: opendev-buildset-registry - system-config-run-graphite - system-config-run-keycloak - - system-config-run-review-3.10: - dependencies: - - name: opendev-buildset-registry - - name: system-config-build-image-gerrit-3.10 - soft: true - system-config-run-review-3.11: dependencies: - name: opendev-buildset-registry - name: system-config-build-image-gerrit-3.11 soft: true - - system-config-upgrade-review: - dependencies: - - name: opendev-buildset-registry - - name: system-config-build-image-gerrit-3.10 - soft: true - - name: system-config-build-image-gerrit-3.11 - soft: true + #- system-config-upgrade-review: + # dependencies: + # - name: opendev-buildset-registry + # - name: system-config-build-image-gerrit-3.10 + # soft: true + # - name: system-config-build-image-gerrit-3.11 + # soft: true - system-config-run-tracing - system-config-run-zookeeper: dependencies: @@ -212,11 +207,6 @@ - name: opendev-buildset-registry - system-config-run-graphite - system-config-run-keycloak - - system-config-run-review-3.10: - dependencies: - - name: opendev-buildset-registry - - name: system-config-upload-image-gerrit-3.10 - soft: true - system-config-run-review-3.11: dependencies: - name: opendev-buildset-registry diff --git a/zuul.d/system-config-run.yaml b/zuul.d/system-config-run.yaml index 7446afff26..579171c9e7 100644 --- a/zuul.d/system-config-run.yaml +++ b/zuul.d/system-config-run.yaml @@ -1050,15 +1050,6 @@ - playbooks/zuul/upgrade-review.yaml - zuul.d/docker-images/gerrit.yaml -- 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' - - job: name: system-config-run-review-3.11 parent: system-config-run-review-base @@ -1068,20 +1059,20 @@ vars: zuul_test_gerrit_version: '3.11' -- job: - name: system-config-upgrade-review - parent: system-config-run-review-base - description: | - Test we can upgrade a gerrit 3.10 to 3.11 - requires: - - gerrit-3.10-container-image - - gerrit-3.11-container-image - vars: - run_playbooks: - - playbooks/letsencrypt.yaml - - playbooks/zuul/upgrade-review.yaml - run_test_playbook: playbooks/zuul/test-review.yaml - zuul_test_gerrit_version: '3.10' +#- job: +# name: system-config-upgrade-review +# parent: system-config-run-review-base +# description: | +# Test we can upgrade a gerrit 3.10 to 3.11 +# requires: +# - gerrit-3.10-container-image +# - gerrit-3.11-container-image +# vars: +# run_playbooks: +# - playbooks/letsencrypt.yaml +# - playbooks/zuul/upgrade-review.yaml +# run_test_playbook: playbooks/zuul/test-review.yaml +# zuul_test_gerrit_version: '3.10' - job: name: system-config-run-static