From c882808578f91830ac7c4f05ec046ce2ed961b56 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Sat, 21 Nov 2020 12:13:55 -0800 Subject: [PATCH] Remove container image builds for old gerrit versions Having upgraded to 3.2, we don't need these versions any more. Change-Id: Ifc37a75aa62b2498e649a4c81b589a04c794184a Depends-On: https://review.opendev.org/763617 --- docker/gerrit/2.13/Dockerfile | 30 -- zuul.d/docker-images/gerrit.yaml | 488 +------------------------------ zuul.d/project.yaml | 6 +- zuul.d/system-config-run.yaml | 4 +- 4 files changed, 6 insertions(+), 522 deletions(-) delete mode 100644 docker/gerrit/2.13/Dockerfile diff --git a/docker/gerrit/2.13/Dockerfile b/docker/gerrit/2.13/Dockerfile deleted file mode 100644 index 6fb0eb40cc..0000000000 --- a/docker/gerrit/2.13/Dockerfile +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright (c) 2019 Red Hat, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -# implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -FROM docker.io/opendevorg/gerrit-base - -# Download the gerrit war -RUN wget https://tarballs.openstack.org/gerrit/gerrit-v2.13.12.11.1707fec.war -O /var/gerrit/bin/gerrit.war - -# Install plugins -RUN mkdir /var/gerrit/plugins && \ - wget https://tarballs.openstack.org/ci/gerrit/plugins/javamelody/javamelody-v2.13.3.e4233d6.jar -O /var/gerrit/plugins/javamelody.jar && \ - wget https://tarballs.openstack.org/ci/gerrit/plugins/its-storyboard/its-storyboard-805f9ac.jar -O /var/gerrit/plugins/its-storyboard.jar && \ - unzip -jo /var/gerrit/bin/gerrit.war WEB-INF/plugins/* -d /var/gerrit/plugins - -# Gerrit 2.13 needs bouncy castle -RUN \ - wget https://repo1.maven.org/maven2/org/bouncycastle/bcprov-jdk15on/1.52/bcprov-jdk15on-1.52.jar -O /var/gerrit/lib/bcprov-1.52.jar && \ - wget https://repo1.maven.org/maven2/org/bouncycastle/bcpkix-jdk15on/1.52/bcpkix-jdk15on-1.52.jar -O /var/gerrit/lib/bcpkix-1.52.jar diff --git a/zuul.d/docker-images/gerrit.yaml b/zuul.d/docker-images/gerrit.yaml index 5bce80d773..c6a41fd414 100644 --- a/zuul.d/docker-images/gerrit.yaml +++ b/zuul.d/docker-images/gerrit.yaml @@ -34,422 +34,6 @@ vars: *gerrit-base_vars files: *gerrit-base_files -# Gerrit 2.13 jobs -- job: - name: system-config-build-image-gerrit-2.13 - description: Build a gerrit 2.13 image. - parent: system-config-build-image - requires: gerrit-base-container-image - provides: gerrit-2.13-container-image - required-projects: &gerrit_projects_2_13 - - name: opendev/system-config - override-checkout: master - vars: &gerrit_vars_2_13 - docker_images: - # The 2.13 image doesn't build from source, but from existing war file - - context: docker/gerrit/2.13 - repository: opendevorg/gerrit - path: /home/zuul/src/opendev.org/opendev/system-config - tags: - - 2.13 - files: &gerrit_files_2_13 - - docker/gerrit/base/ - - docker/gerrit/2.13/ - - jeepyb/ - -- job: - name: system-config-upload-image-gerrit-2.13 - description: Build and upload a gerrit 2.13 image. - parent: system-config-upload-image - requires: gerrit-base-container-image - provides: gerrit-2.13-container-image - required-projects: *gerrit_projects_2_13 - vars: *gerrit_vars_2_13 - files: *gerrit_files_2_13 - -- job: - name: system-config-promote-image-gerrit-2.13 - description: Promote a previously published gerrit 2.13 image to latest. - parent: system-config-promote-image - vars: *gerrit_vars_2_13 - files: *gerrit_files_2_13 - -# Gerrit 2.14 jobs -- job: - name: system-config-build-image-gerrit-2.14 - description: Build a gerrit image. - parent: system-config-build-image - pre-run: playbooks/zuul/gerrit/repos.yaml - run: playbooks/zuul/gerrit/run.yaml - requires: gerrit-base-container-image - provides: gerrit-2.14-container-image - required-projects: &gerrit_projects_2_14 - - name: opendev/system-config - override-checkout: master - - name: gerrit.googlesource.com/gerrit - override-checkout: stable-2.14-2020-11.notedb-refs-tags - - name: gerrit.googlesource.com/plugins/commit-message-length-validator - override-checkout: v2.14.21 - - name: gerrit.googlesource.com/plugins/download-commands - override-checkout: stable-2.14 - - name: gerrit.googlesource.com/plugins/hooks - override-checkout: stable-2.14 - - name: gerrit.googlesource.com/plugins/its-base - override-checkout: stable-2.14 - - name: gerrit.googlesource.com/plugins/its-storyboard - override-checkout: stable-2.14 - - name: gerrit.googlesource.com/plugins/javamelody - override-checkout: stable-2.14 - - name: gerrit.googlesource.com/plugins/replication - override-checkout: stable-2.14 - - name: gerrit.googlesource.com/plugins/reviewnotes - override-checkout: stable-2.14 - - name: gerrit.googlesource.com/plugins/singleusergroup - override-checkout: stable-2.14 - vars: &gerrit_vars_2_14 - bazelisk_targets: "plugins/javamelody:javamelody-deps_deploy.jar release" - docker_images: - - context: docker/gerrit/bazel - repository: opendevorg/gerrit - target: gerrit-2 - path: /home/zuul/src/gerrit.googlesource.com/gerrit - tags: - - 2.14 - files: &gerrit_files_2_14 - - docker/gerrit/base/ - - docker/gerrit/bazel/ - - playbooks/zuul/gerrit/ - - jeepyb/ - -- job: - name: system-config-upload-image-gerrit-2.14 - description: Build and upload a gerrit image. - parent: system-config-upload-image - pre-run: playbooks/zuul/gerrit/repos.yaml - run: playbooks/zuul/gerrit/run.yaml - requires: gerrit-base-container-image - provides: gerrit-2.14-container-image - required-projects: *gerrit_projects_2_14 - vars: *gerrit_vars_2_14 - files: *gerrit_files_2_14 - -- job: - name: system-config-promote-image-gerrit-2.14 - description: Promote a previously published gerrit image to latest. - parent: system-config-promote-image - vars: *gerrit_vars_2_14 - files: *gerrit_files_2_14 - -# Gerrit 2.15 jobs -- job: - name: system-config-build-image-gerrit-2.15 - description: Build a gerrit image. - parent: system-config-build-image - pre-run: playbooks/zuul/gerrit/repos.yaml - run: playbooks/zuul/gerrit/run.yaml - requires: gerrit-base-container-image - provides: gerrit-2.15-container-image - required-projects: &gerrit_projects_2_15 - - name: opendev/system-config - override-checkout: master - - name: gerrit.googlesource.com/gerrit - override-checkout: stable-2.15-2020-11.notedb-refs-tags - - name: gerrit.googlesource.com/plugins/commit-message-length-validator - override-checkout: v2.15.19 - - name: gerrit.googlesource.com/plugins/download-commands - override-checkout: stable-2.15 - - name: gerrit.googlesource.com/plugins/hooks - override-checkout: stable-2.15 - - name: gerrit.googlesource.com/plugins/its-base - override-checkout: stable-2.15 - - name: gerrit.googlesource.com/plugins/its-storyboard - override-checkout: stable-2.15 - - name: gerrit.googlesource.com/plugins/javamelody - override-checkout: stable-2.15 - - name: gerrit.googlesource.com/plugins/replication - override-checkout: stable-2.15 - - name: gerrit.googlesource.com/plugins/reviewnotes - override-checkout: stable-2.15 - - name: gerrit.googlesource.com/plugins/singleusergroup - override-checkout: stable-2.15 - vars: &gerrit_vars_2_15 - bazelisk_targets: "plugins/javamelody:javamelody-deps_deploy.jar release" - docker_images: - - context: docker/gerrit/bazel - repository: opendevorg/gerrit - target: gerrit-2 - path: /home/zuul/src/gerrit.googlesource.com/gerrit - tags: - - 2.15 - files: &gerrit_files_2_15 - - docker/gerrit/base/ - - docker/gerrit/bazel/ - - playbooks/zuul/gerrit/ - - jeepyb/ - -- job: - name: system-config-upload-image-gerrit-2.15 - description: Build and upload a gerrit image. - parent: system-config-upload-image - pre-run: playbooks/zuul/gerrit/repos.yaml - run: playbooks/zuul/gerrit/run.yaml - requires: gerrit-base-container-image - provides: gerrit-2.15-container-image - required-projects: *gerrit_projects_2_15 - vars: *gerrit_vars_2_15 - files: *gerrit_files_2_15 - -- job: - name: system-config-promote-image-gerrit-2.15 - description: Promote a previously published gerrit image to latest. - parent: system-config-promote-image - vars: *gerrit_vars_2_15 - files: *gerrit_files_2_15 - -# Gerrit 2.16 jobs -- job: - name: system-config-build-image-gerrit-2.16 - description: Build a gerrit image. - parent: system-config-build-image - pre-run: playbooks/zuul/gerrit/repos.yaml - run: playbooks/zuul/gerrit/run.yaml - requires: gerrit-base-container-image - provides: gerrit-2.16-container-image - required-projects: &gerrit_projects_2_16 - - name: opendev/system-config - override-checkout: master - - name: gerrit.googlesource.com/gerrit - override-checkout: stable-2.16-2020-11.notedb-refs-tags - - name: gerrit.googlesource.com/plugins/codemirror-editor - override-checkout: v2.16.23 - - name: gerrit.googlesource.com/plugins/commit-message-length-validator - override-checkout: v2.16.23 - - name: gerrit.googlesource.com/plugins/download-commands - override-checkout: stable-2.16 - - name: gerrit.googlesource.com/plugins/hooks - override-checkout: stable-2.16 - - name: gerrit.googlesource.com/plugins/its-base - override-checkout: stable-2.16 - - name: gerrit.googlesource.com/plugins/its-storyboard - override-checkout: stable-2.16 - - name: gerrit.googlesource.com/plugins/javamelody - override-checkout: stable-2.16 - - name: gerrit.googlesource.com/plugins/replication - override-checkout: stable-2.16 - - name: gerrit.googlesource.com/plugins/reviewnotes - override-checkout: stable-2.16 - - name: gerrit.googlesource.com/plugins/singleusergroup - override-checkout: stable-2.16 - vars: &gerrit_vars_2_16 - bazelisk_targets: "plugins/javamelody:javamelody-deps_deploy.jar release" - docker_images: - - context: docker/gerrit/bazel - repository: opendevorg/gerrit - target: gerrit-2 - path: /home/zuul/src/gerrit.googlesource.com/gerrit - tags: - - 2.16 - gerrit_additional_plugins: - - codemirror-editor - files: &gerrit_files_2_16 - - docker/gerrit/base/ - - docker/gerrit/bazel/ - - playbooks/zuul/gerrit/ - - jeepyb/ - -- job: - name: system-config-upload-image-gerrit-2.16 - description: Build and upload a gerrit image. - parent: system-config-upload-image - pre-run: playbooks/zuul/gerrit/repos.yaml - run: playbooks/zuul/gerrit/run.yaml - requires: gerrit-base-container-image - provides: gerrit-2.16-container-image - required-projects: *gerrit_projects_2_16 - vars: *gerrit_vars_2_16 - files: *gerrit_files_2_16 - -- job: - name: system-config-promote-image-gerrit-2.16 - description: Promote a previously published gerrit image to latest. - parent: system-config-promote-image - vars: *gerrit_vars_2_16 - files: *gerrit_files_2_16 - -# Gerrit 3.0 jobs -- job: - name: system-config-build-image-gerrit-3.0 - description: Build a gerrit image. - parent: system-config-build-image - pre-run: playbooks/zuul/gerrit/repos.yaml - run: playbooks/zuul/gerrit/run.yaml - requires: gerrit-base-container-image - provides: gerrit-3.0-container-image - required-projects: &gerrit_projects_3_0 - - name: opendev/system-config - override-checkout: master - - name: gerrit.googlesource.com/gerrit - override-checkout: stable-3.0-2020-11.notedb-refs-tags - - name: gerrit.googlesource.com/plugins/codemirror-editor - override-checkout: v3.0.13 - - name: gerrit.googlesource.com/plugins/commit-message-length-validator - override-checkout: v3.0.13 - - name: gerrit.googlesource.com/plugins/delete-project - override-checkout: stable-3.0 - - name: gerrit.googlesource.com/plugins/download-commands - override-checkout: v3.0.13 - - name: gerrit.googlesource.com/plugins/gitiles - override-checkout: stable-3.0 - - name: gerrit.googlesource.com/plugins/hooks - override-checkout: stable-3.0 - - name: gerrit.googlesource.com/plugins/its-base - override-checkout: stable-3.0 - - name: gerrit.googlesource.com/plugins/its-storyboard - # There is no 3.0 branch - override-checkout: master - - name: gerrit.googlesource.com/plugins/javamelody - override-checkout: stable-3.0 - - name: gerrit.googlesource.com/plugins/plugin-manager - override-checkout: stable-3.0 - - name: gerrit.googlesource.com/plugins/replication - override-checkout: stable-3.0 - - name: gerrit.googlesource.com/plugins/reviewnotes - override-checkout: stable-3.0 - - name: gerrit.googlesource.com/plugins/singleusergroup - override-checkout: stable-3.0 - - name: gerrit.googlesource.com/plugins/webhooks - override-checkout: stable-3.0 - vars: &gerrit_vars_3_0 - docker_images: - - context: docker/gerrit/bazel - repository: opendevorg/gerrit - target: gerrit - path: /home/zuul/src/gerrit.googlesource.com/gerrit - tags: - - 3.0 - gerrit_additional_plugins: - - codemirror-editor - - delete-project - - gitiles - - plugin-manager - - webhooks - files: &gerrit_files_3_0 - - docker/gerrit/base/ - - docker/gerrit/bazel/ - - playbooks/zuul/gerrit/ - - jeepyb/ - -- job: - name: system-config-upload-image-gerrit-3.0 - description: Build and upload a gerrit image. - parent: system-config-upload-image - pre-run: playbooks/zuul/gerrit/repos.yaml - run: playbooks/zuul/gerrit/run.yaml - requires: gerrit-base-container-image - provides: gerrit-3.0-container-image - required-projects: *gerrit_projects_3_0 - vars: *gerrit_vars_3_0 - files: *gerrit_files_3_0 - -- job: - name: system-config-promote-image-gerrit-3.0 - description: Promote a previously published gerrit image to latest. - parent: system-config-promote-image - vars: *gerrit_vars_3_0 - files: *gerrit_files_3_0 - -# Gerrit 3.1 jobs -- job: - name: system-config-build-image-gerrit-3.1 - 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.1-container-image - required-projects: &gerrit_projects_3_1 - - name: opendev/system-config - override-checkout: master - - name: gerrit.googlesource.com/gerrit - override-checkout: stable-3.1-2020-11.notedb-refs-tags - # Plugins common to every build with branches or refs for every build - - name: gerrit.googlesource.com/plugins/commit-message-length-validator - override-checkout: v3.1.8 - - name: gerrit.googlesource.com/plugins/hooks - override-checkout: v3.1.8 - - name: gerrit.googlesource.com/plugins/its-base - override-checkout: stable-3.1 - - name: gerrit.googlesource.com/plugins/its-storyboard - # There is no 3.1 branch - override-checkout: master - - name: gerrit.googlesource.com/plugins/javamelody - override-checkout: stable-3.1 - - name: gerrit.googlesource.com/plugins/replication - override-checkout: stable-3.1 - - name: gerrit.googlesource.com/plugins/reviewnotes - override-checkout: stable-3.1 - # Plugins common to every build without branches or refs for every build - - name: gerrit.googlesource.com/plugins/download-commands - override-checkout: v3.1.8 - - name: gerrit.googlesource.com/plugins/singleusergroup - override-checkout: v3.1.8 - # Plugins not common to every build - - name: gerrit.googlesource.com/plugins/codemirror-editor - override-checkout: v3.1.8 - - name: gerrit.googlesource.com/plugins/delete-project - override-checkout: stable-3.1 - - name: gerrit.googlesource.com/plugins/gitiles - override-checkout: v3.1.8 - - name: gerrit.googlesource.com/plugins/plugin-manager - override-checkout: v3.1.8 - - name: gerrit.googlesource.com/plugins/webhooks - override-checkout: v3.1.8 - # Non plugin submodules - - name: gerrit.googlesource.com/jgit - override-checkout: master - vars: &gerrit_vars_3_1 - docker_images: - - context: docker/gerrit/bazel - repository: opendevorg/gerrit - target: gerrit - path: /home/zuul/src/gerrit.googlesource.com/gerrit - tags: - - 3.1 - gerrit_additional_plugins: - - codemirror-editor - - delete-project - - gitiles - - plugin-manager - - webhooks - files: &gerrit_files_3_1 - - docker/gerrit/base/ - - docker/gerrit/bazel/ - - playbooks/zuul/gerrit/ - - jeepyb/ - -- job: - name: system-config-upload-image-gerrit-3.1 - 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.1-container-image - required-projects: *gerrit_projects_3_1 - vars: *gerrit_vars_3_1 - files: *gerrit_files_3_1 - -- job: - name: system-config-promote-image-gerrit-3.1 - description: Promote a previously published gerrit image to latest. - parent: system-config-promote-image - vars: *gerrit_vars_3_1 - files: *gerrit_files_3_1 - # Gerrit 3.2 jobs - job: name: system-config-build-image-gerrit-3.2 @@ -465,7 +49,7 @@ - name: opendev/system-config override-checkout: master - name: gerrit.googlesource.com/gerrit - override-checkout: stable-3.2-2020-11.notedb-refs-tags + 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.3 @@ -639,38 +223,6 @@ - name: opendev-buildset-registry - name: system-config-build-image-python-builder-3.7 soft: true - - system-config-build-image-gerrit-2.13: - dependencies: - - name: opendev-buildset-registry - - name: system-config-build-image-python-builder-3.7 - soft: true - - name: system-config-build-image-gerrit-base - soft: true - - system-config-build-image-gerrit-2.14: - dependencies: - - name: opendev-buildset-registry - - name: system-config-build-image-gerrit-base - soft: true - - system-config-build-image-gerrit-2.15: - dependencies: - - name: opendev-buildset-registry - - name: system-config-build-image-gerrit-base - soft: true - - system-config-build-image-gerrit-2.16: - dependencies: - - name: opendev-buildset-registry - - name: system-config-build-image-gerrit-base - soft: true - - system-config-build-image-gerrit-3.0: - dependencies: - - name: opendev-buildset-registry - - name: system-config-build-image-gerrit-base - soft: true - - system-config-build-image-gerrit-3.1: - dependencies: - - name: opendev-buildset-registry - - name: system-config-build-image-gerrit-base - soft: true - system-config-build-image-gerrit-3.2: dependencies: - name: opendev-buildset-registry @@ -689,38 +241,6 @@ - name: opendev-buildset-registry - name: system-config-upload-image-python-builder-3.7 soft: true - - system-config-upload-image-gerrit-2.13: - dependencies: - - name: opendev-buildset-registry - - name: system-config-upload-image-python-builder-3.7 - soft: true - - name: system-config-upload-image-gerrit-base - soft: true - - system-config-upload-image-gerrit-2.14: - dependencies: - - name: opendev-buildset-registry - - name: system-config-upload-image-gerrit-base - soft: true - - system-config-upload-image-gerrit-2.15: - dependencies: - - name: opendev-buildset-registry - - name: system-config-upload-image-gerrit-base - soft: true - - system-config-upload-image-gerrit-2.16: - dependencies: - - name: opendev-buildset-registry - - name: system-config-upload-image-gerrit-base - soft: true - - system-config-upload-image-gerrit-3.0: - dependencies: - - name: opendev-buildset-registry - - name: system-config-upload-image-gerrit-base - soft: true - - system-config-upload-image-gerrit-3.1: - dependencies: - - name: opendev-buildset-registry - - name: system-config-upload-image-gerrit-base - soft: true - system-config-upload-image-gerrit-3.2: dependencies: - name: opendev-buildset-registry @@ -729,10 +249,4 @@ deploy: jobs: - system-config-promote-image-gerrit-base - - system-config-promote-image-gerrit-2.13 - - system-config-promote-image-gerrit-2.14 - - system-config-promote-image-gerrit-2.15 - - system-config-promote-image-gerrit-2.16 - - system-config-promote-image-gerrit-3.0 - - system-config-promote-image-gerrit-3.1 - system-config-promote-image-gerrit-3.2 diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 449d0aaa35..d8e3a23e32 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -58,7 +58,7 @@ - system-config-run-review: dependencies: - name: opendev-buildset-registry - - name: system-config-build-image-gerrit-2.13 + - name: system-config-build-image-gerrit-3.2 soft: true - system-config-run-zookeeper - system-config-run-zuul @@ -153,7 +153,7 @@ - system-config-run-review: dependencies: - name: opendev-buildset-registry - - name: system-config-upload-image-gerrit-2.13 + - name: system-config-upload-image-gerrit-3.2 soft: true - system-config-run-zookeeper - system-config-run-zuul @@ -225,7 +225,7 @@ - playbooks/roles/gerrit/defaults/main.yaml - playbooks/roles/gerrit/tasks/manage-projects.yaml dependencies: - - name: system-config-promote-image-gerrit-2.13 + - name: system-config-promote-image-gerrit-3.2 soft: true - name: infra-prod-install-ansible soft: true diff --git a/zuul.d/system-config-run.yaml b/zuul.d/system-config-run.yaml index 2b952bfa46..2c84860c3f 100644 --- a/zuul.d/system-config-run.yaml +++ b/zuul.d/system-config-run.yaml @@ -819,7 +819,7 @@ parent: system-config-run-containers description: | Run the playbook for gerrit (in a container). - requires: gerrit-2.13-container-image + requires: gerrit-3.2-container-image nodeset: nodes: - name: bridge.openstack.org @@ -864,7 +864,7 @@ - playbooks/zuul/templates/group_vars/review-dev.yaml.j2 - playbooks/zuul/templates/group_vars/review.yaml.j2 - testinfra/test_gerrit.py - - docker/gerrit/2.13/ + - docker/gerrit/ - job: name: system-config-run-static