From 46faa6626b94932686a506282e11570d022d9652 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Thu, 7 Oct 2021 11:58:56 -0700 Subject: [PATCH] Remove Gerrit 3.2 images This should be merged after we are on 3.3 and happy with the state of things. Depends-On: https://review.opendev.org/c/openstack/project-config/+/813081 Change-Id: I4173df5e4ae38af6423402be0299470323762da2 --- zuul.d/docker-images/gerrit.yaml | 105 ------------------------------- zuul.d/project.yaml | 10 --- zuul.d/system-config-run.yaml | 9 --- 3 files changed, 124 deletions(-) diff --git a/zuul.d/docker-images/gerrit.yaml b/zuul.d/docker-images/gerrit.yaml index 07b3dd0b14..2c3b0e9380 100644 --- a/zuul.d/docker-images/gerrit.yaml +++ b/zuul.d/docker-images/gerrit.yaml @@ -39,100 +39,6 @@ vars: *gerrit-base_vars files: *gerrit-base_files -# Gerrit 3.2 jobs -- job: - name: system-config-build-image-gerrit-3.2 - 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.2-container-image - required-projects: &gerrit_projects_3_2 - - name: opendev/system-config - override-checkout: master - - name: gerrit.googlesource.com/gerrit - override-checkout: stable-3.2 - # Plugins common to every build with branches or refs for every build - - name: gerrit.googlesource.com/plugins/commit-message-length-validator - override-checkout: v3.2.12 - - name: gerrit.googlesource.com/plugins/hooks - override-checkout: v3.2.12 - - name: gerrit.googlesource.com/plugins/its-base - override-checkout: stable-3.2 - - name: gerrit.googlesource.com/plugins/its-storyboard - # There is no 3.2 branch - override-checkout: master - - name: gerrit.googlesource.com/plugins/javamelody - # There is no 3.2 branch - override-checkout: master - - name: gerrit.googlesource.com/plugins/replication - override-checkout: stable-3.2 - - name: gerrit.googlesource.com/plugins/reviewnotes - override-checkout: stable-3.2 - # Plugins common to every build without branches or refs for every build - - name: gerrit.googlesource.com/plugins/download-commands - override-checkout: v3.2.12 - - name: gerrit.googlesource.com/plugins/singleusergroup - override-checkout: stable-3.2 - # Plugins not common to every build - - name: gerrit.googlesource.com/plugins/codemirror-editor - override-checkout: v3.2.12 - - name: gerrit.googlesource.com/plugins/delete-project - override-checkout: stable-3.2 - - name: gerrit.googlesource.com/plugins/gitiles - override-checkout: stable-3.2 - - name: gerrit.googlesource.com/plugins/plugin-manager - override-checkout: v3.2.12 - - name: gerrit.googlesource.com/plugins/webhooks - override-checkout: v3.2.12 - - 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.2.12 - vars: &gerrit_vars_3_2 - docker_images: - - context: docker/gerrit/bazel - repository: opendevorg/gerrit - target: gerrit - path: /home/zuul/src/gerrit.googlesource.com/gerrit - tags: - - 3.2 - files: &gerrit_files_3_2 - - 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.2 - 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.2-container-image - required-projects: *gerrit_projects_3_2 - vars: *gerrit_vars_3_2 - files: *gerrit_files_3_2 - -- job: - name: system-config-promote-image-gerrit-3.2 - description: Promote a previously published gerrit image to latest. - parent: system-config-promote-image - vars: *gerrit_vars_3_2 - files: *gerrit_files_3_2 - # Gerrit 3.3 jobs - job: name: system-config-build-image-gerrit-3.3 @@ -415,11 +321,6 @@ - name: opendev-buildset-registry - name: system-config-build-image-python-builder-3.7-buster soft: true - - system-config-build-image-gerrit-3.2: - dependencies: - - name: opendev-buildset-registry - - name: system-config-build-image-gerrit-base - soft: true - system-config-build-image-gerrit-3.3: dependencies: - name: opendev-buildset-registry @@ -443,11 +344,6 @@ - name: opendev-buildset-registry - name: system-config-upload-image-python-builder-3.7-buster soft: true - - system-config-upload-image-gerrit-3.2: - dependencies: - - name: opendev-buildset-registry - - name: system-config-upload-image-gerrit-base - soft: true - system-config-upload-image-gerrit-3.3: dependencies: - name: opendev-buildset-registry @@ -461,6 +357,5 @@ deploy: jobs: - system-config-promote-image-gerrit-base - - system-config-promote-image-gerrit-3.2 - 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 6ea4d3d635..59d2331574 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -61,11 +61,6 @@ - name: system-config-build-image-grafana soft: true - system-config-run-graphite - - system-config-run-review-3.2: - dependencies: - - name: opendev-buildset-registry - - name: system-config-build-image-gerrit-3.2 - soft: true - system-config-run-review-3.3: dependencies: - name: opendev-buildset-registry @@ -226,11 +221,6 @@ - name: system-config-upload-image-grafana soft: true - system-config-run-graphite - - system-config-run-review-3.2: - dependencies: - - name: opendev-buildset-registry - - name: system-config-upload-image-gerrit-3.2 - soft: true - system-config-run-review-3.3: dependencies: - name: opendev-buildset-registry diff --git a/zuul.d/system-config-run.yaml b/zuul.d/system-config-run.yaml index a0d53d70ba..fc2c128f78 100644 --- a/zuul.d/system-config-run.yaml +++ b/zuul.d/system-config-run.yaml @@ -887,15 +887,6 @@ - testinfra/test_gerrit.py - docker/gerrit/ -- job: - name: system-config-run-review-3.2 - parent: system-config-run-review-base - description: | - Run the playbook for gerrit 3.2 (in a container). - requires: gerrit-3.2-container-image - vars: - zuul_test_gerrit_version: '3.2' - - job: name: system-config-run-review-3.3 parent: system-config-run-review-base