From cee951e6a98fad17650e09c8673d337cbab593c1 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Wed, 26 Apr 2023 10:52:54 -0700 Subject: [PATCH] Remove Gerrit 3.6 image builds and test jobs We've been running Gerrit 3.7 for some time now and seem very unlikely to revert at this point. Clean up the Gerrit 3.6 image builds as we don't need them anymore. THis change also comments out the 3.6 -> 3.8 upgrade job. Followup changes will add 3.8 image builds and test the 3.7 -> 3.8 upgrade process. Depends-On: https://review.opendev.org/c/openstack/project-config/+/881595 Change-Id: I759b34e48dcede7ffaa66c83da01b81c4fed4b4f --- playbooks/zuul/upgrade-review.yaml | 6 +- zuul.d/docker-images/gerrit.yaml | 104 ----------------------------- zuul.d/project.yaml | 29 +++----- zuul.d/system-config-run.yaml | 40 +++++------ 4 files changed, 29 insertions(+), 150 deletions(-) diff --git a/playbooks/zuul/upgrade-review.yaml b/playbooks/zuul/upgrade-review.yaml index 08f111807e..7c55803562 100644 --- a/playbooks/zuul/upgrade-review.yaml +++ b/playbooks/zuul/upgrade-review.yaml @@ -7,7 +7,7 @@ - name: Ensure initial gerrit state without starting Gerrit import_playbook: ../service-review.yaml vars: - gerrit_container_image: docker.io/opendevorg/gerrit:3.6 + gerrit_container_image: docker.io/opendevorg/gerrit:3.7 gerrit_run_init: false gerrit_run_reindex: false gerrit_run_compose_up: false @@ -35,7 +35,7 @@ - name: Start Gerrit on the old version of Gerrit import_playbook: ../service-review.yaml vars: - gerrit_container_image: docker.io/opendevorg/gerrit:3.6 + gerrit_container_image: docker.io/opendevorg/gerrit:3.7 - hosts: "review:!disabled" name: "Wait for gerrit to be up and running" @@ -84,7 +84,7 @@ - name: Perform gerrit upgrade import_playbook: ../service-review.yaml vars: - gerrit_container_image: docker.io/opendevorg/gerrit:3.7 + gerrit_container_image: docker.io/opendevorg/gerrit:3.8 gerrit_run_init: true # Gerrit 3.6 -> 3.7 upgrade requires an offline reindex gerrit_run_reindex: true diff --git a/zuul.d/docker-images/gerrit.yaml b/zuul.d/docker-images/gerrit.yaml index 23c873667d..cccbeffd90 100644 --- a/zuul.d/docker-images/gerrit.yaml +++ b/zuul.d/docker-images/gerrit.yaml @@ -43,99 +43,6 @@ vars: *gerrit-base_vars files: *gerrit-base_files -# Gerrit 3.6 jobs -- job: - name: system-config-build-image-gerrit-3.6 - 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.6-container-image - required-projects: &gerrit_projects_3_6 - - name: opendev/system-config - override-checkout: master - - name: gerrit.googlesource.com/gerrit - override-checkout: stable-3.6 - # Backend behavior plugins - - name: gerrit.googlesource.com/plugins/commit-message-length-validator - override-checkout: v3.6.4 - - name: gerrit.googlesource.com/plugins/delete-project - override-checkout: v3.6.4 - - name: gerrit.googlesource.com/plugins/hooks - override-checkout: v3.6.4 - - name: gerrit.googlesource.com/plugins/its-base - # There is no 3.6 branch - override-checkout: master - - name: gerrit.googlesource.com/plugins/its-storyboard - # There is no 3.6 branch - override-checkout: master - - name: gerrit.googlesource.com/plugins/plugin-manager - override-checkout: v3.6.4 - - name: gerrit.googlesource.com/plugins/replication - override-checkout: v3.6.4 - - name: gerrit.googlesource.com/plugins/reviewnotes - override-checkout: v3.6.4 - - name: gerrit.googlesource.com/plugins/singleusergroup - override-checkout: v3.6.4 - - name: gerrit.googlesource.com/plugins/webhooks - override-checkout: v3.6.4 - # UI behavior plugins - - name: gerrit.googlesource.com/plugins/codemirror-editor - override-checkout: v3.6.4 - # Requires master until new stable-3.6 release and - # subsequent plugin tag - - name: gerrit.googlesource.com/plugins/download-commands - override-checkout: master - - name: gerrit.googlesource.com/plugins/gitiles - override-checkout: v3.6.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.6.4 - vars: &gerrit_vars_3_6 - docker_images: - - context: docker/gerrit/bazel - repository: opendevorg/gerrit - target: gerrit - path: /home/zuul/src/gerrit.googlesource.com/gerrit - tags: - - 3.6 - files: &gerrit_files_3_6 - - 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.6 - 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.6-container-image - required-projects: *gerrit_projects_3_6 - vars: *gerrit_vars_3_6 - files: *gerrit_files_3_6 - -- job: - name: system-config-promote-image-gerrit-3.6 - description: Promote a previously published gerrit image to latest. - parent: system-config-promote-image - vars: *gerrit_vars_3_6 - files: *gerrit_files_3_6 - # Gerrit 3.7 jobs - job: name: system-config-build-image-gerrit-3.7 @@ -320,11 +227,6 @@ - name: opendev-buildset-registry - name: system-config-build-image-python-builder-3.9-bullseye soft: true - - system-config-build-image-gerrit-3.6: - dependencies: - - name: opendev-buildset-registry - - name: system-config-build-image-gerrit-base - soft: true - system-config-build-image-gerrit-3.7: dependencies: - name: opendev-buildset-registry @@ -343,11 +245,6 @@ - name: opendev-buildset-registry - name: system-config-upload-image-python-builder-3.9-bullseye soft: true - - system-config-upload-image-gerrit-3.6: - dependencies: - - name: opendev-buildset-registry - - name: system-config-upload-image-gerrit-base - soft: true - system-config-upload-image-gerrit-3.7: dependencies: - name: opendev-buildset-registry @@ -356,5 +253,4 @@ deploy: jobs: - system-config-promote-image-gerrit-base - - system-config-promote-image-gerrit-3.6 - system-config-promote-image-gerrit-3.7 diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 2d32f099af..ed5f51f109 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -65,23 +65,19 @@ - name: opendev-buildset-registry - system-config-run-graphite - system-config-run-keycloak - - system-config-run-review-3.6: - dependencies: - - name: opendev-buildset-registry - - name: system-config-build-image-gerrit-3.6 - soft: true - system-config-run-review-3.7: dependencies: - name: opendev-buildset-registry - name: system-config-build-image-gerrit-3.7 soft: true - - system-config-upgrade-review: - dependencies: - - name: opendev-buildset-registry - - name: system-config-build-image-gerrit-3.6 - soft: true - - name: system-config-build-image-gerrit-3.7 - soft: true + # TODO update upgrade job to do 3.7 -> 3.8 upgrades + #- 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: @@ -222,11 +218,6 @@ - name: opendev-buildset-registry - system-config-run-graphite - system-config-run-keycloak - - system-config-run-review-3.6: - dependencies: - - name: opendev-buildset-registry - - name: system-config-upload-image-gerrit-3.6 - soft: true - system-config-run-review-3.7: dependencies: - name: opendev-buildset-registry @@ -525,7 +516,7 @@ soft: true - name: infra-prod-letsencrypt soft: true - - name: system-config-promote-image-gerrit-3.6 + - name: system-config-promote-image-gerrit-3.7 soft: true - infra-prod-service-tracing: &infra-prod-service-tracing dependencies: @@ -579,7 +570,7 @@ soft: true - name: infra-prod-service-gitea soft: true - - name: system-config-promote-image-gerrit-3.6 + - name: system-config-promote-image-gerrit-3.7 soft: true # Note that this job also runs from project-config, so we # match system-config specific files here rather than the diff --git a/zuul.d/system-config-run.yaml b/zuul.d/system-config-run.yaml index 4e074e18b0..60a11b562e 100644 --- a/zuul.d/system-config-run.yaml +++ b/zuul.d/system-config-run.yaml @@ -1119,38 +1119,30 @@ - playbooks/zuul/test-review.yaml - playbooks/zuul/upgrade-review.yaml -- job: - name: system-config-run-review-3.6 - parent: system-config-run-review-base - description: | - Run the playbook for gerrit 3.6 (in a container). - requires: gerrit-3.6-container-image - vars: - zuul_test_gerrit_version: '3.6' - - 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.6-container-image + requires: gerrit-3.7-container-image vars: 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.6 to 3.7 - requires: - - gerrit-3.6-container-image - - gerrit-3.7-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.6' +# TODO Update the upgrade job to test 3.7 -> 3.8 upgrades +#- 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