diff --git a/zuul.d/docker-images/gerrit.yaml b/zuul.d/docker-images/gerrit.yaml index bf5cee8f9a..0033ebf58d 100644 --- a/zuul.d/docker-images/gerrit.yaml +++ b/zuul.d/docker-images/gerrit.yaml @@ -39,96 +39,6 @@ vars: *gerrit-base_vars files: *gerrit-base_files -# Gerrit 3.5 jobs -- job: - name: system-config-build-image-gerrit-3.5 - 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.5-container-image - required-projects: &gerrit_projects_3_5 - - name: opendev/system-config - override-checkout: master - - name: gerrit.googlesource.com/gerrit - override-checkout: stable-3.5 - # Backend behavior plugins - - name: gerrit.googlesource.com/plugins/commit-message-length-validator - override-checkout: v3.5.4 - - name: gerrit.googlesource.com/plugins/delete-project - override-checkout: stable-3.5 - - name: gerrit.googlesource.com/plugins/hooks - override-checkout: v3.5.4 - - name: gerrit.googlesource.com/plugins/its-base - override-checkout: stable-3.5 - - name: gerrit.googlesource.com/plugins/its-storyboard - # There is no 3.5 branch - override-checkout: master - - name: gerrit.googlesource.com/plugins/plugin-manager - override-checkout: v3.5.4 - - name: gerrit.googlesource.com/plugins/replication - override-checkout: stable-3.5 - - name: gerrit.googlesource.com/plugins/reviewnotes - override-checkout: v3.5.4 - - name: gerrit.googlesource.com/plugins/singleusergroup - override-checkout: v3.5.4 - - name: gerrit.googlesource.com/plugins/webhooks - override-checkout: stable-3.5 - # UI behavior plugins - - name: gerrit.googlesource.com/plugins/codemirror-editor - override-checkout: v3.5.4 - - name: gerrit.googlesource.com/plugins/download-commands - override-checkout: v3.5.4 - - name: gerrit.googlesource.com/plugins/gitiles - override-checkout: stable-3.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.5.4 - vars: &gerrit_vars_3_5 - docker_images: - - context: docker/gerrit/bazel - repository: opendevorg/gerrit - target: gerrit - path: /home/zuul/src/gerrit.googlesource.com/gerrit - tags: - - 3.5 - files: &gerrit_files_3_5 - - 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.5 - 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.5-container-image - required-projects: *gerrit_projects_3_5 - vars: *gerrit_vars_3_5 - files: *gerrit_files_3_5 - -- job: - name: system-config-promote-image-gerrit-3.5 - description: Promote a previously published gerrit image to latest. - parent: system-config-promote-image - vars: *gerrit_vars_3_5 - files: *gerrit_files_3_5 - # Gerrit 3.6 jobs - job: name: system-config-build-image-gerrit-3.6 @@ -313,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.5: - dependencies: - - name: opendev-buildset-registry - - name: system-config-build-image-gerrit-base - soft: true - system-config-build-image-gerrit-3.6: dependencies: - name: opendev-buildset-registry @@ -336,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.5: - dependencies: - - name: opendev-buildset-registry - - name: system-config-upload-image-gerrit-base - soft: true - system-config-upload-image-gerrit-3.6: dependencies: - name: opendev-buildset-registry @@ -349,5 +249,4 @@ deploy: jobs: - system-config-promote-image-gerrit-base - - system-config-promote-image-gerrit-3.5 - system-config-promote-image-gerrit-3.6 diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 347a825a9f..4491533219 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -65,23 +65,18 @@ - name: opendev-buildset-registry - system-config-run-graphite - system-config-run-keycloak - - system-config-run-review-3.5: - dependencies: - - name: opendev-buildset-registry - - name: system-config-build-image-gerrit-3.5 - soft: true - system-config-run-review-3.6: dependencies: - name: opendev-buildset-registry - name: system-config-build-image-gerrit-3.6 soft: true - - system-config-upgrade-review: - dependencies: - - name: opendev-buildset-registry - - name: system-config-build-image-gerrit-3.5 - soft: true - - name: system-config-build-image-gerrit-3.6 - soft: true + #- system-config-upgrade-review: + # dependencies: + # - name: opendev-buildset-registry + # - name: system-config-build-image-gerrit-3.5 + # soft: true + # - name: system-config-build-image-gerrit-3.6 + # soft: true - system-config-build-image-refstack - system-config-run-refstack: dependencies: @@ -222,11 +217,6 @@ - name: opendev-buildset-registry - system-config-run-graphite - system-config-run-keycloak - - system-config-run-review-3.5: - dependencies: - - name: opendev-buildset-registry - - name: system-config-upload-image-gerrit-3.5 - soft: true - system-config-run-review-3.6: dependencies: - name: opendev-buildset-registry @@ -520,7 +510,7 @@ soft: true - name: infra-prod-letsencrypt soft: true - - name: system-config-promote-image-gerrit-3.5 + - name: system-config-promote-image-gerrit-3.6 soft: true - infra-prod-service-tracing: &infra-prod-service-tracing dependencies: @@ -574,7 +564,7 @@ soft: true - name: infra-prod-service-gitea soft: true - - name: system-config-promote-image-gerrit-3.5 + - name: system-config-promote-image-gerrit-3.6 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 0c9b7b1b2a..2cae7ee9be 100644 --- a/zuul.d/system-config-run.yaml +++ b/zuul.d/system-config-run.yaml @@ -1106,15 +1106,6 @@ - playbooks/zuul/test-review.yaml - playbooks/zuul/upgrade-review.yaml -- job: - name: system-config-run-review-3.5 - parent: system-config-run-review-base - description: | - Run the playbook for gerrit 3.5 (in a container). - requires: gerrit-3.5-container-image - vars: - zuul_test_gerrit_version: '3.5' - - job: name: system-config-run-review-3.6 parent: system-config-run-review-base @@ -1124,20 +1115,20 @@ vars: zuul_test_gerrit_version: '3.6' -- job: - name: system-config-upgrade-review - parent: system-config-run-review-base - description: | - Test we can upgrade a gerrit 3.5 to 3.6 - requires: - - gerrit-3.5-container-image - - gerrit-3.6-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.5' +#- job: +# name: system-config-upgrade-review +# parent: system-config-run-review-base +# description: | +# Test we can upgrade a gerrit 3.5 to 3.6 +# requires: +# - gerrit-3.5-container-image +# - gerrit-3.6-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.5' - job: name: system-config-run-static