diff --git a/.zuul.yaml b/.zuul.yaml index e3c72dd758..fd48964efa 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -245,7 +245,6 @@ tags: - 2.15 files: &gerrit_files_2_15 - - docker/bazel/.* - docker/gerrit/base/.* - docker/gerrit/bazel/.* - playbooks/zuul/gerrit/.* @@ -311,7 +310,6 @@ gerrit_additional_plugins: - codemirror-editor files: &gerrit_files_2_16 - - docker/bazel/.* - docker/gerrit/base/.* - docker/gerrit/bazel/.* - playbooks/zuul/gerrit/.* @@ -389,7 +387,6 @@ - plugin-manager - webhooks files: &gerrit_files_3_0 - - docker/bazel/.* - docker/gerrit/base/.* - docker/gerrit/bazel/.* - playbooks/zuul/gerrit/.* @@ -471,7 +468,6 @@ This job is used in system-config. parent: system-config-build-image-gerrit-master-base files: &gerrit_files_master - - docker/bazel/.* - docker/gerrit/base/.* - docker/gerrit/bazel/.* - playbooks/zuul/gerrit/.* @@ -555,32 +551,6 @@ vars: *python-base_vars files: *python-base_files -# bazel jobs -- job: - name: system-config-build-image-bazel - description: Build a bazel image. - parent: system-config-build-image - vars: &bazel_vars - docker_images: - - context: docker/bazel - repository: opendevorg/bazel - files: &bazel_files - - docker/bazel/.* - -- job: - name: system-config-upload-image-bazel - description: Build and upload a bazel image. - parent: system-config-upload-image - vars: *bazel_vars - files: *bazel_files - -- job: - name: system-config-promote-image-bazel - description: Promote a previously published bazel image to latest. - parent: system-config-promote-image - vars: *bazel_vars - files: *bazel_files - # gerrit-base jobs - job: name: system-config-build-image-gerrit-base @@ -1346,7 +1316,6 @@ soft: true - system-config-run-zuul-preview - system-config-run-letsencrypt - - system-config-build-image-bazel - system-config-build-image-jinja-init: dependencies: - name: system-config-build-image-python-base @@ -1371,30 +1340,22 @@ - system-config-build-image-gerrit-2.15: dependencies: - name: opendev-buildset-registry - - name: system-config-build-image-bazel - soft: true - 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-bazel - soft: true - 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-bazel - soft: true - name: system-config-build-image-gerrit-base soft: true - system-config-build-image-gerrit-master: voting: false dependencies: - name: opendev-buildset-registry - - name: system-config-build-image-bazel - soft: true - name: system-config-build-image-gerrit-base soft: true - system-config-build-image-haproxy-statsd: @@ -1435,7 +1396,6 @@ soft: true - system-config-run-zuul-preview - system-config-run-letsencrypt - - system-config-upload-image-bazel - system-config-upload-image-jinja-init: dependencies: - name: system-config-upload-image-python-base @@ -1460,22 +1420,16 @@ - system-config-upload-image-gerrit-2.15: dependencies: - name: opendev-buildset-registry - - name: system-config-upload-image-bazel - soft: true - 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-bazel - soft: true - 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-bazel - soft: true - name: system-config-upload-image-gerrit-base soft: true - system-config-upload-image-haproxy-statsd: @@ -1486,7 +1440,6 @@ - system-config-upload-image-python-builder promote: jobs: - - system-config-promote-image-bazel - system-config-promote-image-jinja-init - system-config-promote-image-gitea-init - system-config-promote-image-gitea diff --git a/docker/bazel/Dockerfile b/docker/bazel/Dockerfile deleted file mode 100644 index 74f19fe4eb..0000000000 --- a/docker/bazel/Dockerfile +++ /dev/null @@ -1,31 +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 l.gcr.io/google/bazel:1.2.0 as bazel - -# The bazel image comes with bazel only runnable by root for some weird reason. -# The bower build in gerrit does not work as root. -# Fix the bazel image. -RUN groupadd builder && \ - useradd builder --home-dir /usr/src --create-home -g builder -RUN chown -R builder /usr/src /usr/local/lib/bazel \ - && chmod +x /usr/local/lib/bazel - -RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - \ - && apt-get update \ - && apt-get install -y nodejs - -USER builder -WORKDIR /usr/src diff --git a/docker/gerrit/base/Dockerfile b/docker/gerrit/base/Dockerfile index a67ed078ff..24f8803796 100644 --- a/docker/gerrit/base/Dockerfile +++ b/docker/gerrit/base/Dockerfile @@ -48,7 +48,6 @@ RUN mkdir /var/gerrit/bin \ && mkdir /var/gerrit/hooks \ && mkdir /var/gerrit/static -# Force gerrit to use bouncycastle for security things. # Download mysql-connector so that gerrit doens't download it during init. RUN mkdir /var/gerrit/lib && \ wget https://repo1.maven.org/maven2/mysql/mysql-connector-java/5.1.43/mysql-connector-java-5.1.43.jar -O /var/gerrit/lib/mysql-connector-java.jar