From 5d1fe75294b44216034352eed386a34ccfb9ec31 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Fri, 6 Dec 2024 11:35:04 -0800 Subject: [PATCH] Drop Gerrit 3.9 image builds and testing Once we're satisfied that we will not be downgrading from Gerrit 3.10 to 3.9 we can safely drop the 3.9 image builds and testing. Followups will add forward looking 3.11 image builds and testing. Depends-On: https://review.opendev.org/c/openstack/project-config/+/937268 Change-Id: Ie46cd8b74147c835fbe5e414d13b3f7d3237c7cf --- zuul.d/docker-images/gerrit.yaml | 104 ------------------------------- zuul.d/project.yaml | 25 +++----- zuul.d/system-config-run.yaml | 38 +++++------ 3 files changed, 23 insertions(+), 144 deletions(-) diff --git a/zuul.d/docker-images/gerrit.yaml b/zuul.d/docker-images/gerrit.yaml index ade5de183f..d0f99ebc32 100644 --- a/zuul.d/docker-images/gerrit.yaml +++ b/zuul.d/docker-images/gerrit.yaml @@ -44,99 +44,6 @@ vars: *gerrit-base_vars files: *gerrit-base_files -# Gerrit 3.9 jobs -- job: - name: system-config-build-image-gerrit-3.9 - 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.9-container-image - required-projects: &gerrit_projects_3_9 - - name: opendev/system-config - override-checkout: master - - name: gerrit.googlesource.com/gerrit - override-checkout: stable-3.9 - # Backend behavior plugins - - name: gerrit.googlesource.com/plugins/commit-message-length-validator - override-checkout: v3.9.8 - - name: gerrit.googlesource.com/plugins/delete-project - override-checkout: stable-3.9 - - name: gerrit.googlesource.com/plugins/hooks - override-checkout: v3.9.8 - - name: gerrit.googlesource.com/plugins/its-base - # There is no 3.9 branch - override-checkout: master - - name: gerrit.googlesource.com/plugins/its-storyboard - # There is no 3.9 branch - override-checkout: master - - name: gerrit.googlesource.com/plugins/plugin-manager - override-checkout: v3.9.8 - - name: gerrit.googlesource.com/plugins/replication - override-checkout: v3.9.8 - - name: gerrit.googlesource.com/plugins/reviewnotes - override-checkout: v3.9.8 - - name: gerrit.googlesource.com/plugins/singleusergroup - override-checkout: v3.9.8 - - name: gerrit.googlesource.com/plugins/webhooks - override-checkout: v3.9.8 - # UI behavior plugins - - name: gerrit.googlesource.com/plugins/codemirror-editor - override-checkout: v3.9.8 - - name: gerrit.googlesource.com/plugins/download-commands - override-checkout: v3.9.8 - - name: gerrit.googlesource.com/plugins/gitiles - override-checkout: v3.9.8 - - 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.9.8 - vars: &gerrit_vars_3_9 - docker_images: - - context: docker/gerrit/bazel - repository: opendevorg/gerrit - target: gerrit - path: /home/zuul/src/gerrit.googlesource.com/gerrit - tags: - - 3.9 - files: &gerrit_files_3_9 - - 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.9 - 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.9-container-image - required-projects: *gerrit_projects_3_9 - vars: *gerrit_vars_3_9 - files: *gerrit_files_3_9 - -- job: - name: system-config-promote-image-gerrit-3.9 - description: Promote a previously published gerrit image to latest. - parent: system-config-promote-image - vars: *gerrit_vars_3_9 - files: *gerrit_files_3_9 - # Gerrit 3.10 jobs - job: name: system-config-build-image-gerrit-3.10 @@ -325,11 +232,6 @@ - name: opendev-buildset-registry - name: system-config-build-image-python-builder-3.11-bookworm soft: true - - system-config-build-image-gerrit-3.9: - dependencies: - - 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 @@ -348,11 +250,6 @@ - name: opendev-buildset-registry - name: system-config-upload-image-python-builder-3.11-bookworm soft: true - - system-config-upload-image-gerrit-3.9: - dependencies: - - 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 @@ -361,5 +258,4 @@ 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 9a8f9143b3..c01ab8f85b 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -62,23 +62,19 @@ - name: opendev-buildset-registry - system-config-run-graphite - system-config-run-keycloak - - system-config-run-review-3.9: - dependencies: - - 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 - - system-config-upgrade-review: - dependencies: - - name: opendev-buildset-registry - - name: system-config-build-image-gerrit-3.9 - soft: true - - name: system-config-build-image-gerrit-3.10 - soft: true + # Disabled until we can test the 3.10 -> 3.11 upgrade + #- system-config-upgrade-review: + # dependencies: + # - name: opendev-buildset-registry + # - name: system-config-build-image-gerrit-3.9 + # soft: true + # - name: system-config-build-image-gerrit-3.10 + # soft: true - system-config-build-image-refstack - system-config-run-refstack: dependencies: @@ -219,11 +215,6 @@ - name: opendev-buildset-registry - system-config-run-graphite - system-config-run-keycloak - - system-config-run-review-3.9: - dependencies: - - 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 diff --git a/zuul.d/system-config-run.yaml b/zuul.d/system-config-run.yaml index f83010d1af..7751f55a95 100644 --- a/zuul.d/system-config-run.yaml +++ b/zuul.d/system-config-run.yaml @@ -1094,15 +1094,6 @@ - playbooks/zuul/upgrade-review.yaml - zuul.d/docker-images/gerrit.yaml -- job: - name: system-config-run-review-3.9 - parent: system-config-run-review-base - description: | - Run the playbook for gerrit 3.9 (in a container). - requires: gerrit-3.9-container-image - vars: - zuul_test_gerrit_version: '3.9' - - job: name: system-config-run-review-3.10 parent: system-config-run-review-base @@ -1112,20 +1103,21 @@ vars: 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.9 to 3.10 - requires: - - gerrit-3.9-container-image - - gerrit-3.10-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.9' +# Disabled until we can test the 3.10 to 3.11 upgrade +#- job: +# name: system-config-upgrade-review +# parent: system-config-run-review-base +# description: | +# Test we can upgrade a gerrit 3.9 to 3.10 +# requires: +# - gerrit-3.9-container-image +# - gerrit-3.10-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.9' - job: name: system-config-run-static