opendev/system-config
Code Issues Proposed changes

Cleanup Gerrit 3.7 image jobs and disable Gerrit upgrade job

Browse Source 
We'll want to merge this when we're confident that we won't be reverting
Gerrit back to 3.7 from 3.8. A followup will add Gerrit 3.9 images and
reenable the upgrade job.

Depends-On: https://review.opendev.org/c/openstack/project-config/+/901465
Change-Id: I26b5afadbe271cb6abea5b8bd79fa8a4a30ea478
This commit is contained in:
Clark Boylan 2023-11-20 08:08:35 -08:00
parent c17fe1155a
commit 0cdea3b3c9
3 changed files with 21 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
zuul.d/docker-images/gerrit.yaml
View File

@ -43,97 +43,6 @@
vars: *gerrit-base_vars
files: *gerrit-base_files
# Gerrit 3.7 jobs
- job:
name: system-config-build-image-gerrit-3.7
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.7-container-image
required-projects: &gerrit_projects_3_7
- name: opendev/system-config
override-checkout: master
- name: gerrit.googlesource.com/gerrit
override-checkout: stable-3.7
# Backend behavior plugins
- name: gerrit.googlesource.com/plugins/commit-message-length-validator
override-checkout: v3.7.5
- name: gerrit.googlesource.com/plugins/delete-project
override-checkout: stable-3.7
- name: gerrit.googlesource.com/plugins/hooks
override-checkout: v3.7.5
- name: gerrit.googlesource.com/plugins/its-base
# There is no 3.7 branch
override-checkout: master
- name: gerrit.googlesource.com/plugins/its-storyboard
# There is no 3.7 branch
override-checkout: master
- name: gerrit.googlesource.com/plugins/plugin-manager
override-checkout: v3.7.5
- name: gerrit.googlesource.com/plugins/replication
override-checkout: v3.7.5
- name: gerrit.googlesource.com/plugins/reviewnotes
override-checkout: v3.7.5
- name: gerrit.googlesource.com/plugins/singleusergroup
override-checkout: v3.7.5
- name: gerrit.googlesource.com/plugins/webhooks
override-checkout: v3.7.5
# UI behavior plugins
- name: gerrit.googlesource.com/plugins/codemirror-editor
override-checkout: v3.7.5
- name: gerrit.googlesource.com/plugins/download-commands
override-checkout: v3.7.5
- name: gerrit.googlesource.com/plugins/gitiles
override-checkout: v3.7.5
- 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.7.5
vars: &gerrit_vars_3_7
docker_images:
- context: docker/gerrit/bazel
repository: opendevorg/gerrit
target: gerrit
path: /home/zuul/src/gerrit.googlesource.com/gerrit
tags:
- 3.7
files: &gerrit_files_3_7
- 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.7
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.7-container-image
required-projects: *gerrit_projects_3_7
vars: *gerrit_vars_3_7
files: *gerrit_files_3_7
- job:
name: system-config-promote-image-gerrit-3.7
description: Promote a previously published gerrit image to latest.
parent: system-config-promote-image
vars: *gerrit_vars_3_7
files: *gerrit_files_3_7
# Gerrit 3.8 jobs
- job:
name: system-config-build-image-gerrit-3.8
@ -318,11 +227,6 @@
- name: opendev-buildset-registry
- name: system-config-build-image-python-builder-3.11-bookworm
soft: true
- system-config-build-image-gerrit-3.7:
dependencies:
- name: opendev-buildset-registry
- name: system-config-build-image-gerrit-base
soft: true
- system-config-build-image-gerrit-3.8:
dependencies:
- name: opendev-buildset-registry
@ -341,11 +245,6 @@
- name: opendev-buildset-registry
- name: system-config-upload-image-python-builder-3.11-bookworm
soft: true
- system-config-upload-image-gerrit-3.7:
dependencies:
- name: opendev-buildset-registry
- name: system-config-upload-image-gerrit-base
soft: true
- system-config-upload-image-gerrit-3.8:
dependencies:
- name: opendev-buildset-registry
@ -354,5 +253,4 @@
deploy:
jobs:
- system-config-promote-image-gerrit-base
- system-config-promote-image-gerrit-3.7
- system-config-promote-image-gerrit-3.8

24
zuul.d/project.yaml
View File

@ -64,23 +64,18 @@
- name: opendev-buildset-registry
- system-config-run-graphite
- system-config-run-keycloak
- system-config-run-review-3.7:
dependencies:
- name: opendev-buildset-registry
- name: system-config-build-image-gerrit-3.7
soft: true
- system-config-run-review-3.8:
dependencies:
- name: opendev-buildset-registry
- name: system-config-build-image-gerrit-3.8
soft: true
- system-config-upgrade-review:
dependencies:
- name: opendev-buildset-registry
- name: system-config-build-image-gerrit-3.7
soft: true
- name: system-config-build-image-gerrit-3.8
soft: true
#- system-config-upgrade-review:
# dependencies:
# - name: opendev-buildset-registry
# - name: system-config-build-image-gerrit-3.7
# soft: true
# - name: system-config-build-image-gerrit-3.8
# soft: true
- system-config-build-image-refstack
- system-config-run-refstack:
dependencies:
@ -224,11 +219,6 @@
- name: opendev-buildset-registry
- system-config-run-graphite
- system-config-run-keycloak
- system-config-run-review-3.7:
dependencies:
- name: opendev-buildset-registry
- name: system-config-upload-image-gerrit-3.7
soft: true
- system-config-run-review-3.8:
dependencies:
- name: opendev-buildset-registry

37
zuul.d/system-config-run.yaml
View File

@ -1075,15 +1075,6 @@
- playbooks/zuul/test-review.yaml
- playbooks/zuul/upgrade-review.yaml
- job:
name: system-config-run-review-3.7
parent: system-config-run-review-base
description: |
Run the playbook for gerrit 3.7 (in a container).
requires: gerrit-3.7-container-image
vars:
zuul_test_gerrit_version: '3.7'
- job:
name: system-config-run-review-3.8
parent: system-config-run-review-base
@ -1093,20 +1084,20 @@
vars:
zuul_test_gerrit_version: '3.8'
- job:
name: system-config-upgrade-review
parent: system-config-run-review-base
description: |
Test we can upgrade a gerrit 3.7 to 3.8
requires:
- gerrit-3.7-container-image
- gerrit-3.8-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.7'
#- job:
# name: system-config-upgrade-review
# parent: system-config-run-review-base
# description: |
# Test we can upgrade a gerrit 3.7 to 3.8
# requires:
# - gerrit-3.7-container-image
# - gerrit-3.8-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.7'
- job:
name: system-config-run-static