diff --git a/zuul.d/docker-images/gerrit.yaml b/zuul.d/docker-images/gerrit.yaml index 7310fb1013..3acfecf903 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.3 jobs -- job: - name: system-config-build-image-gerrit-3.3 - 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.3-container-image - required-projects: &gerrit_projects_3_3 - - name: opendev/system-config - override-checkout: master - - name: gerrit.googlesource.com/gerrit - override-checkout: stable-3.3 - # Backend behavior plugins - - name: gerrit.googlesource.com/plugins/commit-message-length-validator - override-checkout: v3.3.9 - - name: gerrit.googlesource.com/plugins/delete-project - override-checkout: stable-3.3 - - name: gerrit.googlesource.com/plugins/hooks - override-checkout: v3.3.9 - - name: gerrit.googlesource.com/plugins/its-base - # There is no 3.3 branch - override-checkout: master - - name: gerrit.googlesource.com/plugins/its-storyboard - # There is no 3.3 branch - override-checkout: master - - name: gerrit.googlesource.com/plugins/plugin-manager - override-checkout: v3.3.9 - - name: gerrit.googlesource.com/plugins/replication - override-checkout: stable-3.3 - - name: gerrit.googlesource.com/plugins/reviewnotes - override-checkout: v3.3.9 - - name: gerrit.googlesource.com/plugins/singleusergroup - override-checkout: stable-3.3 - - name: gerrit.googlesource.com/plugins/webhooks - override-checkout: stable-3.3 - # UI behavior plugins - - name: gerrit.googlesource.com/plugins/codemirror-editor - override-checkout: stable-3.3 - - name: gerrit.googlesource.com/plugins/download-commands - override-checkout: v3.3.9 - - name: gerrit.googlesource.com/plugins/gitiles - override-checkout: stable-3.3 - - 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.3.9 - vars: &gerrit_vars_3_3 - docker_images: - - context: docker/gerrit/bazel - repository: opendevorg/gerrit - target: gerrit - path: /home/zuul/src/gerrit.googlesource.com/gerrit - tags: - - 3.3 - files: &gerrit_files_3_3 - - 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.3 - 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.3-container-image - required-projects: *gerrit_projects_3_3 - vars: *gerrit_vars_3_3 - files: *gerrit_files_3_3 - -- job: - name: system-config-promote-image-gerrit-3.3 - description: Promote a previously published gerrit image to latest. - parent: system-config-promote-image - vars: *gerrit_vars_3_3 - files: *gerrit_files_3_3 - # Gerrit 3.4 jobs - job: name: system-config-build-image-gerrit-3.4 @@ -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.3: - dependencies: - - name: opendev-buildset-registry - - name: system-config-build-image-gerrit-base - soft: true - system-config-build-image-gerrit-3.4: 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.3: - dependencies: - - name: opendev-buildset-registry - - name: system-config-upload-image-gerrit-base - soft: true - system-config-upload-image-gerrit-3.4: dependencies: - name: opendev-buildset-registry @@ -350,5 +249,4 @@ deploy: jobs: - system-config-promote-image-gerrit-base - - system-config-promote-image-gerrit-3.3 - system-config-promote-image-gerrit-3.4 diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 434da0dbc6..6451a56034 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -60,23 +60,19 @@ - name: opendev-buildset-registry - system-config-run-graphite - system-config-run-keycloak - - system-config-run-review-3.3: - dependencies: - - name: opendev-buildset-registry - - name: system-config-build-image-gerrit-3.3 - soft: true - system-config-run-review-3.4: dependencies: - name: opendev-buildset-registry - name: system-config-build-image-gerrit-3.4 soft: true - - system-config-upgrade-review: - dependencies: - - name: opendev-buildset-registry - - name: system-config-build-image-gerrit-3.3 - soft: true - - name: system-config-build-image-gerrit-3.4 - soft: true + # TODO reenable when we have 3.5 images to upgrade to + #- system-config-upgrade-review: + # dependencies: + # - name: opendev-buildset-registry + # - name: system-config-build-image-gerrit-3.3 + # soft: true + # - name: system-config-build-image-gerrit-3.4 + # soft: true - system-config-build-image-refstack - system-config-run-refstack: dependencies: @@ -218,11 +214,6 @@ - name: opendev-buildset-registry - system-config-run-graphite - system-config-run-keycloak - - system-config-run-review-3.3: - dependencies: - - name: opendev-buildset-registry - - name: system-config-upload-image-gerrit-3.3 - soft: true - system-config-run-review-3.4: dependencies: - name: opendev-buildset-registry diff --git a/zuul.d/system-config-run.yaml b/zuul.d/system-config-run.yaml index 13c26cfd8c..b1eb5dfd37 100644 --- a/zuul.d/system-config-run.yaml +++ b/zuul.d/system-config-run.yaml @@ -952,15 +952,6 @@ - docker/gerrit/ - playbooks/zuul/upgrade-review.yaml -- job: - name: system-config-run-review-3.3 - parent: system-config-run-review-base - description: | - Run the playbook for gerrit 3.3 (in a container). - requires: gerrit-3.3-container-image - vars: - zuul_test_gerrit_version: '3.3' - - job: name: system-config-run-review-3.4 parent: system-config-run-review-base @@ -970,19 +961,20 @@ vars: zuul_test_gerrit_version: '3.4' -- job: - name: system-config-upgrade-review - parent: system-config-run-review-base - description: | - Test we can upgrade a gerrit 3.3 to 3.4 - requires: - - gerrit-3.3-container-image - - gerrit-3.4-container-image - vars: - run_playbooks: - - playbooks/letsencrypt.yaml - - playbooks/zuul/upgrade-review.yaml - zuul_test_gerrit_version: '3.3' +# TODO reenable this job when we have 3.5 images to upgrade to. +#- job: +# name: system-config-upgrade-review +# parent: system-config-run-review-base +# description: | +# Test we can upgrade a gerrit 3.3 to 3.4 +# requires: +# - gerrit-3.3-container-image +# - gerrit-3.4-container-image +# vars: +# run_playbooks: +# - playbooks/letsencrypt.yaml +# - playbooks/zuul/upgrade-review.yaml +# zuul_test_gerrit_version: '3.3' - job: name: system-config-run-static