diff --git a/config/jobs/image-pushing/k8s-staging-test-infra.yaml b/config/jobs/image-pushing/k8s-staging-test-infra.yaml index 2af604625989..17e9b6ffbe6b 100644 --- a/config/jobs/image-pushing/k8s-staging-test-infra.yaml +++ b/config/jobs/image-pushing/k8s-staging-test-infra.yaml @@ -1,34 +1,5 @@ postsubmits: kubernetes/test-infra: - # - # job images, e.g. images/* - # - - name: post-test-infra-push-bazelbuild - cluster: k8s-infra-prow-build-trusted - run_if_changed: '^images/bazelbuild/' - annotations: - testgrid-dashboards: sig-testing-image-pushes, sig-k8s-infra-gcb - testgrid-tab-name: bazelbuild - testgrid-alert-email: kubernetes-sig-testing-alerts@googlegroups.com, k8s-infra-alerts@kubernetes.io - testgrid-num-failures-to-alert: '1' - description: builds and pushes the image builder's own image - decorate: true - branches: - - ^master$ - max_concurrency: 1 - # avoid overloading GCB logs quota for the shared staging project - job_queue_name: "test-infra-staging-image-push" - spec: - serviceAccountName: gcb-builder - containers: - - image: gcr.io/k8s-staging-test-infra/image-builder:v20250914-3092127382 - command: - - /run.sh - args: - - --scratch-bucket=gs://k8s-staging-test-infra-gcb - - --project=k8s-staging-test-infra - - --build-dir=. - - images/bazelbuild/ - name: post-test-infra-push-benchmarkjunit cluster: k8s-infra-prow-build-trusted run_if_changed: '^pkg/benchmarkjunit/' diff --git a/images/bazelbuild/Dockerfile b/images/bazelbuild/Dockerfile deleted file mode 100644 index eb5a22800c32..000000000000 --- a/images/bazelbuild/Dockerfile +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 2016 The Kubernetes Authors. -# -# 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. - -# Includes git, gcloud, and bazel. -ARG OLD_BAZEL_VERSION -FROM gcr.io/bazel-public/bazel:${OLD_BAZEL_VERSION} as old -FROM ubuntu:18.04 - -# add env we can debug with the image name:tag -ARG IMAGE_ARG -ENV IMAGE=${IMAGE_ARG} - -ARG BAZEL_VERSION - -RUN apt-get update && apt-get install -y --no-install-recommends \ - build-essential \ - ca-certificates \ - file \ - git \ - openssh-client \ - python2.7 \ - python3 \ - python-pip \ - python3-pip \ - rpm \ - unzip \ - wget \ - zip \ - zlib1g-dev \ - && rm -rf /var/lib/apt/lists/* \ - && pip install --no-cache-dir setuptools wheel \ - && pip3 install --no-cache-dir setuptools wheel - -RUN wget -q https://dl.google.com/dl/cloudsdk/channels/rapid/google-cloud-sdk.tar.gz && \ - tar xf google-cloud-sdk.tar.gz && \ - rm google-cloud-sdk.tar.gz && \ - ./google-cloud-sdk/install.sh -ENV PATH "/google-cloud-sdk/bin:${PATH}" - -ENV NODE_VERSION 6.10.0 -RUN wget -q https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.xz && \ - tar xf node-v${NODE_VERSION}-linux-x64.tar.xz --strip-components=1 -C /usr && \ - rm node-v${NODE_VERSION}-linux-x64.tar.xz && \ - npm install -g mocha - -RUN INSTALLER="bazel-${BAZEL_VERSION}-installer-linux-x86_64.sh"; \ - DOWNLOAD_URL="https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/${INSTALLER}"; \ - wget -q "${DOWNLOAD_URL}" && \ - chmod +x "${INSTALLER}" && "./${INSTALLER}" && rm "${INSTALLER}" - -ARG OLD_BAZEL_VERSION -COPY --from=old \ - /usr/local/lib/bazel/bin/bazel-real /usr/local/lib/bazel/bin/bazel-${OLD_BAZEL_VERSION} - - -WORKDIR /workspace -COPY runner /usr/local/bin/ -ENTRYPOINT ["/bin/bash", "/usr/local/bin/runner"] diff --git a/images/bazelbuild/Makefile b/images/bazelbuild/Makefile deleted file mode 100644 index a779e60d8cbb..000000000000 --- a/images/bazelbuild/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 2016 The Kubernetes Authors. -# -# 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. - -push-prod: - ../../hack/make-rules/go-run/arbitrary.sh run ./images/builder --project=k8s-staging-test-infra --scratch-bucket=gs://k8s-staging-test-infra-gcb --build-dir=. images/bazelbuild - -push: - ../../hack/make-rules/go-run/arbitrary.sh run ./images/builder --allow-dirty --build-dir=. images/bazelbuild - -.PHONY: push push-prod diff --git a/images/bazelbuild/README.md b/images/bazelbuild/README.md deleted file mode 100644 index e7a378047979..000000000000 --- a/images/bazelbuild/README.md +++ /dev/null @@ -1,11 +0,0 @@ -# bazelbuild image - -This image is used for a variety of deploy/push jobs that run in the test-infra-trusted cluster. It contains: - -- two versions of bazel, to support migration from one to the other -- gcloud -- kubectl -- npm -- python2.7 -- python3 -- (and some other miscellaneous dependencies) diff --git a/images/bazelbuild/cloudbuild.yaml b/images/bazelbuild/cloudbuild.yaml deleted file mode 100644 index 81c06937736a..000000000000 --- a/images/bazelbuild/cloudbuild.yaml +++ /dev/null @@ -1,22 +0,0 @@ -steps: - - name: gcr.io/cloud-builders/docker - args: - - build - - --tag=gcr.io/$PROJECT_ID/bazelbuild:$_GIT_TAG-$_CONFIG - - --build-arg=BAZEL_VERSION=$_BAZEL_VERSION - - --build-arg=OLD_BAZEL_VERSION=$_OLD_BAZEL_VERSION - - --build-arg=IMAGE_ARG=gcr.io/$PROJECT_ID/bazelbuild:$_GIT_TAG-$_CONFIG - - . - dir: images/bazelbuild/ - - name: gcr.io/cloud-builders/docker - args: - - tag - - gcr.io/$PROJECT_ID/bazelbuild:$_GIT_TAG-$_CONFIG - - gcr.io/$PROJECT_ID/bazelbuild:latest-$_CONFIG -substitutions: - _GIT_TAG: '12345' - _BAZEL_VERSION: something - _OLD_BAZEL_VERSION: something-older -images: - - 'gcr.io/$PROJECT_ID/bazelbuild:$_GIT_TAG-$_CONFIG' - - 'gcr.io/$PROJECT_ID/bazelbuild:latest-$_CONFIG' diff --git a/images/bazelbuild/runner b/images/bazelbuild/runner deleted file mode 100755 index 317781fc8993..000000000000 --- a/images/bazelbuild/runner +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env bash -# Copyright 2016 The Kubernetes Authors. -# -# 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. - -set -o errexit -set -o nounset -set -o pipefail -set -o xtrace - -git clone https://github.com/kubernetes/test-infra -./test-infra/jenkins/bootstrap.py \ - "$@" diff --git a/images/bazelbuild/variants.yaml b/images/bazelbuild/variants.yaml deleted file mode 100644 index fd0854818978..000000000000 --- a/images/bazelbuild/variants.yaml +++ /dev/null @@ -1,13 +0,0 @@ -variants: - deprecated: # Delete after switching jobs to new variant - CONFIG: 2.2.0 - BAZEL_VERSION: 3.0.0 - OLD_BAZEL_VERSION: 2.2.0 - test-infra: - CONFIG: test-infra - BAZEL_VERSION: 3.4.1 - OLD_BAZEL_VERSION: 3.1.0 - testgrid: - CONFIG: testgrid - BAZEL_VERSION: 3.4.1 - OLD_BAZEL_VERSION: 3.0.0