From 063ec0f5a79bc5afd63bb44de5bdd4cdf0cca449 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Tue, 21 Jun 2022 07:50:09 -0700 Subject: [PATCH] Remove Gerrit 3.4 jobs This removes our Gerrit 3.4 image builds as well as testing. We should land this after an appropriate amount of time has passed since the 3.5 upgrade that we are unlikely to revert. Depends-On: https://review.opendev.org/c/openstack/project-config/+/847057 Change-Id: Iefa7cc1157311f0239794b15bea7c93f0c625a93 --- zuul.d/docker-images/gerrit.yaml | 102 ------------------------------- zuul.d/project.yaml | 26 +++----- zuul.d/system-config-run.yaml | 9 --- 3 files changed, 9 insertions(+), 128 deletions(-) diff --git a/zuul.d/docker-images/gerrit.yaml b/zuul.d/docker-images/gerrit.yaml index 656c790742..c811547d8c 100644 --- a/zuul.d/docker-images/gerrit.yaml +++ b/zuul.d/docker-images/gerrit.yaml @@ -39,97 +39,6 @@ vars: *gerrit-base_vars files: *gerrit-base_files -# Gerrit 3.4 jobs -- job: - name: system-config-build-image-gerrit-3.4 - 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.4-container-image - required-projects: &gerrit_projects_3_4 - - name: opendev/system-config - override-checkout: master - - name: gerrit.googlesource.com/gerrit - override-checkout: stable-3.4 - # Backend behavior plugins - - name: gerrit.googlesource.com/plugins/commit-message-length-validator - override-checkout: v3.4.5 - - name: gerrit.googlesource.com/plugins/delete-project - override-checkout: stable-3.4 - - name: gerrit.googlesource.com/plugins/hooks - override-checkout: v3.4.5 - - name: gerrit.googlesource.com/plugins/its-base - # There is no 3.4 branch - override-checkout: master - - name: gerrit.googlesource.com/plugins/its-storyboard - # There is no 3.4 branch - override-checkout: master - - name: gerrit.googlesource.com/plugins/plugin-manager - override-checkout: v3.4.5 - - name: gerrit.googlesource.com/plugins/replication - override-checkout: stable-3.4 - - name: gerrit.googlesource.com/plugins/reviewnotes - override-checkout: v3.4.5 - - name: gerrit.googlesource.com/plugins/singleusergroup - override-checkout: v3.4.5 - - name: gerrit.googlesource.com/plugins/webhooks - override-checkout: stable-3.4 - # UI behavior plugins - - name: gerrit.googlesource.com/plugins/codemirror-editor - override-checkout: stable-3.4 - - name: gerrit.googlesource.com/plugins/download-commands - override-checkout: v3.4.5 - - name: gerrit.googlesource.com/plugins/gitiles - override-checkout: stable-3.4 - - 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.4.5 - vars: &gerrit_vars_3_4 - docker_images: - - context: docker/gerrit/bazel - repository: opendevorg/gerrit - target: gerrit - path: /home/zuul/src/gerrit.googlesource.com/gerrit - tags: - - 3.4 - files: &gerrit_files_3_4 - - 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.4 - 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.4-container-image - required-projects: *gerrit_projects_3_4 - vars: *gerrit_vars_3_4 - files: *gerrit_files_3_4 - -- job: - name: system-config-promote-image-gerrit-3.4 - description: Promote a previously published gerrit image to latest. - parent: system-config-promote-image - vars: *gerrit_vars_3_4 - files: *gerrit_files_3_4 - # Gerrit 3.5 jobs - job: name: system-config-build-image-gerrit-3.5 @@ -314,11 +223,6 @@ - name: opendev-buildset-registry - name: system-config-build-image-python-builder-3.9-bullseye soft: true - - system-config-build-image-gerrit-3.4: - dependencies: - - name: opendev-buildset-registry - - name: system-config-build-image-gerrit-base - soft: true - system-config-build-image-gerrit-3.5: dependencies: - name: opendev-buildset-registry @@ -337,11 +241,6 @@ - name: opendev-buildset-registry - name: system-config-upload-image-python-builder-3.9-bullseye soft: true - - system-config-upload-image-gerrit-3.4: - dependencies: - - name: opendev-buildset-registry - - name: system-config-upload-image-gerrit-base - soft: true - system-config-upload-image-gerrit-3.5: dependencies: - name: opendev-buildset-registry @@ -350,5 +249,4 @@ deploy: jobs: - system-config-promote-image-gerrit-base - - system-config-promote-image-gerrit-3.4 - system-config-promote-image-gerrit-3.5 diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 8907fd50f0..897b8b38e4 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -60,23 +60,20 @@ - name: opendev-buildset-registry - system-config-run-graphite - system-config-run-keycloak - - system-config-run-review-3.4: - dependencies: - - name: opendev-buildset-registry - - name: system-config-build-image-gerrit-3.4 - soft: true - system-config-run-review-3.5: dependencies: - name: opendev-buildset-registry - name: system-config-build-image-gerrit-3.5 soft: true - - system-config-upgrade-review: - dependencies: - - name: opendev-buildset-registry - - name: system-config-build-image-gerrit-3.4 - soft: true - - name: system-config-build-image-gerrit-3.5 - soft: true + # Temporarily disabled until we have 3.6 images to perform + # a 3.5 -> 3.6 upgrade. + #- system-config-upgrade-review: + # dependencies: + # - name: opendev-buildset-registry + # - name: system-config-build-image-gerrit-3.4 + # soft: true + # - name: system-config-build-image-gerrit-3.5 + # soft: true - system-config-build-image-refstack - system-config-run-refstack: dependencies: @@ -209,11 +206,6 @@ - name: opendev-buildset-registry - system-config-run-graphite - system-config-run-keycloak - - system-config-run-review-3.4: - dependencies: - - name: opendev-buildset-registry - - name: system-config-upload-image-gerrit-3.4 - soft: true - system-config-run-review-3.5: dependencies: - name: opendev-buildset-registry diff --git a/zuul.d/system-config-run.yaml b/zuul.d/system-config-run.yaml index 80863fbc6a..d90bbb1c0a 100644 --- a/zuul.d/system-config-run.yaml +++ b/zuul.d/system-config-run.yaml @@ -962,15 +962,6 @@ - docker/gerrit/ - playbooks/zuul/upgrade-review.yaml -- job: - name: system-config-run-review-3.4 - parent: system-config-run-review-base - description: | - Run the playbook for gerrit 3.4 (in a container). - requires: gerrit-3.4-container-image - vars: - zuul_test_gerrit_version: '3.4' - - job: name: system-config-run-review-3.5 parent: system-config-run-review-base