diff --git a/zuul.d/docker-images/gerrit.yaml b/zuul.d/docker-images/gerrit.yaml index 875019b70f..6e29ed71f0 100644 --- a/zuul.d/docker-images/gerrit.yaml +++ b/zuul.d/docker-images/gerrit.yaml @@ -44,98 +44,6 @@ vars: *gerrit-base_vars files: *gerrit-base_files -# Gerrit 3.8 jobs -- job: - name: system-config-build-image-gerrit-3.8 - 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.8-container-image - required-projects: &gerrit_projects_3_8 - - name: opendev/system-config - override-checkout: master - - name: gerrit.googlesource.com/gerrit - override-checkout: stable-3.8 - # Backend behavior plugins - - name: gerrit.googlesource.com/plugins/commit-message-length-validator - override-checkout: v3.8.6 - - name: gerrit.googlesource.com/plugins/delete-project - override-checkout: stable-3.8 - - name: gerrit.googlesource.com/plugins/hooks - override-checkout: v3.8.6 - - name: gerrit.googlesource.com/plugins/its-base - # There is no 3.8 branch - override-checkout: master - - name: gerrit.googlesource.com/plugins/its-storyboard - # There is no 3.8 branch - override-checkout: master - - name: gerrit.googlesource.com/plugins/plugin-manager - override-checkout: v3.8.6 - - name: gerrit.googlesource.com/plugins/replication - override-checkout: v3.8.6 - - name: gerrit.googlesource.com/plugins/reviewnotes - override-checkout: v3.8.6 - - name: gerrit.googlesource.com/plugins/singleusergroup - override-checkout: v3.8.6 - - name: gerrit.googlesource.com/plugins/webhooks - override-checkout: v3.8.6 - # UI behavior plugins - - name: gerrit.googlesource.com/plugins/codemirror-editor - override-checkout: v3.8.6 - - name: gerrit.googlesource.com/plugins/download-commands - override-checkout: v3.8.6 - - name: gerrit.googlesource.com/plugins/gitiles - override-checkout: v3.8.6 - - 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.8.6 - vars: &gerrit_vars_3_8 - docker_images: - - context: docker/gerrit/bazel - repository: opendevorg/gerrit - target: gerrit - path: /home/zuul/src/gerrit.googlesource.com/gerrit - tags: - - 3.8 - files: &gerrit_files_3_8 - - docker/gerrit/base/ - - docker/gerrit/bazel/ - - playbooks/zuul/gerrit/ - - playbooks/test-review.yaml - - testinfra/test_gerrit.py - - jeepyb/ - - roles/bazelisk-build/ - - zuul.d/docker-images/gerrit.yaml - -- job: - name: system-config-upload-image-gerrit-3.8 - 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.8-container-image - required-projects: *gerrit_projects_3_8 - vars: *gerrit_vars_3_8 - files: *gerrit_files_3_8 - -- job: - name: system-config-promote-image-gerrit-3.8 - description: Promote a previously published gerrit image to latest. - parent: system-config-promote-image - vars: *gerrit_vars_3_8 - files: *gerrit_files_3_8 - # Gerrit 3.9 jobs - job: name: system-config-build-image-gerrit-3.9 @@ -324,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.8: - dependencies: - - name: opendev-buildset-registry - - name: system-config-build-image-gerrit-base - soft: true - system-config-build-image-gerrit-3.9: dependencies: - name: opendev-buildset-registry @@ -347,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.8: - dependencies: - - name: opendev-buildset-registry - - name: system-config-upload-image-gerrit-base - soft: true - system-config-upload-image-gerrit-3.9: dependencies: - name: opendev-buildset-registry @@ -360,5 +258,4 @@ deploy: jobs: - system-config-promote-image-gerrit-base - - system-config-promote-image-gerrit-3.8 - system-config-promote-image-gerrit-3.9 diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 585de69ddf..8c8c6c6b26 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -63,23 +63,20 @@ - name: opendev-buildset-registry - system-config-run-graphite - system-config-run-keycloak - - system-config-run-review-3.8: - dependencies: - - name: opendev-buildset-registry - - name: system-config-build-image-gerrit-3.8 - soft: true - system-config-run-review-3.9: dependencies: - name: opendev-buildset-registry - name: system-config-build-image-gerrit-3.9 soft: true - - system-config-upgrade-review: - dependencies: - - name: opendev-buildset-registry - - name: system-config-build-image-gerrit-3.8 - soft: true - - name: system-config-build-image-gerrit-3.9 - soft: true + # Temporarily disabled until we have 3.10 images and + # perform a 3.9 -> 3.10 upgrade test. + #- system-config-upgrade-review: + # dependencies: + # - name: opendev-buildset-registry + # - name: system-config-build-image-gerrit-3.8 + # soft: true + # - name: system-config-build-image-gerrit-3.9 + # soft: true - system-config-build-image-refstack - system-config-run-refstack: dependencies: @@ -224,11 +221,6 @@ - name: opendev-buildset-registry - system-config-run-graphite - system-config-run-keycloak - - system-config-run-review-3.8: - dependencies: - - name: opendev-buildset-registry - - name: system-config-upload-image-gerrit-3.8 - soft: true - system-config-run-review-3.9: dependencies: - name: opendev-buildset-registry diff --git a/zuul.d/system-config-run.yaml b/zuul.d/system-config-run.yaml index 12f5d9ccff..8750127fa2 100644 --- a/zuul.d/system-config-run.yaml +++ b/zuul.d/system-config-run.yaml @@ -1083,15 +1083,6 @@ - playbooks/zuul/upgrade-review.yaml - zuul.d/docker-images/gerrit.yaml -- job: - name: system-config-run-review-3.8 - parent: system-config-run-review-base - description: | - Run the playbook for gerrit 3.8 (in a container). - requires: gerrit-3.8-container-image - vars: - zuul_test_gerrit_version: '3.8' - - job: name: system-config-run-review-3.9 parent: system-config-run-review-base @@ -1101,20 +1092,22 @@ vars: zuul_test_gerrit_version: '3.9' -- job: - name: system-config-upgrade-review - parent: system-config-run-review-base - description: | - Test we can upgrade a gerrit 3.8 to 3.9 - requires: - - gerrit-3.8-container-image - - gerrit-3.9-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.8' +# Temporarily disabled until we have 3.10 images and +# perform a 3.9 -> 3.10 upgrade test. +#- job: +# name: system-config-upgrade-review +# parent: system-config-run-review-base +# description: | +# Test we can upgrade a gerrit 3.8 to 3.9 +# requires: +# - gerrit-3.8-container-image +# - gerrit-3.9-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.8' - job: name: system-config-run-static