Merge pull request #2224 from justaugustus/ci-builder-no-bazel

k8s-ci-builder: Sync with cleanups in krte

Author: k8s-ci-robot

images/releng/k8s-ci-builder/Dockerfile

@@ -14,7 +14,6 @@
 
 ARG GO_VERSION
 ARG OS_CODENAME
-ARG OLD_BAZEL_VERSION
 
 # The Golang version for the builder image should always be explicitly set to
 # the Golang version of the kubernetes/kubernetes active development branch
@@ -29,41 +28,31 @@ RUN ./compile-release-tools
 ### Production image
 
 # Includes tools used for building Kubernetes in CI
-#
-# NOTE: we attempt to avoid unnecessary tools and image layers while
-# supporting kubernetes builds, kind installation, etc.
-
-FROM launcher.gcr.io/google/bazel:${OLD_BAZEL_VERSION} as old-bazel
 FROM debian:${OS_CODENAME}
 
 # arg that specifies the image name (for debugging)
 ARG IMAGE_ARG
-# arg that specifies the bazel version to install
-ARG BAZEL_VERSION
+
+# arg that specifies the go version to install
 ARG GO_VERSION
 
 # add envs:
 # - so we can debug with the image name:tag
-# - with the bazel version
 # - adding gsutil etc. to path (where we will install them)
 # - disabling prompts when installing gsutil etc.
 # - hinting that we are in a docker container
 ENV IMAGE=${IMAGE_ARG} \
-    BAZEL_VERSION=${BAZEL_VERSION} \
     GOPATH=/home/prow/go \
     PATH=/home/prow/go/bin:/usr/local/go/bin:/google-cloud-sdk/bin:${PATH} \
     CLOUDSDK_CORE_DISABLE_PROMPTS=1 \
     CONTAINER=docker
 
 # copy in image utility scripts
-COPY ["images/releng/k8s-ci-builder/wrapper.sh", \
-      "images/releng/k8s-ci-builder/create_bazel_cache_rcs.sh", \
-      "images/releng/k8s-ci-builder/install-bazel.sh", \
-      "/usr/local/bin/"]
+COPY images/releng/k8s-ci-builder/wrapper.sh /usr/local/bin/
 
 # Install tools needed to:
 # - install docker
-# - build kubernetes (dockerized, or with bazel)
+# - build kubernetes (dockerized)
 #
 # TODO: the `sed` is a bit of a hack, look into alternatives.
 # Why this exists: `docker service start` on debian runs a `cgroupfs_mount` method,
@@ -82,13 +71,8 @@ RUN echo "Installing Packages ..." \
             gnupg2 \
             jq \
             kmod \
-            libassuan-dev \
-            libbtrfs-dev \
-            libdevmapper-dev \
-            libgpgme-dev \
             lsb-release \
             mercurial \
-            openssh-client \
             pkg-config \
             procps \
             python \
@@ -104,9 +88,7 @@ RUN echo "Installing Packages ..." \
         && tar xzf "${GO_TARBALL}" -C /usr/local \
         && rm "${GO_TARBALL}"\
         && mkdir -p "${GOPATH}/bin" \
-    && echo "Installing Bazel ..." \
-        && install-bazel.sh \
-        && echo "Installing gcloud SDK, kubectl ..." \
+    && echo "Installing gcloud SDK, kubectl ..." \
         && curl -fsSL https://dl.google.com/dl/cloudsdk/channels/rapid/google-cloud-sdk.tar.gz --output google-cloud-sdk.tar.gz \
         && tar xzf google-cloud-sdk.tar.gz -C / \
         && rm google-cloud-sdk.tar.gz \
@@ -116,8 +98,6 @@ RUN echo "Installing Packages ..." \
             --path-update=false \
             --usage-reporting=false \
         && gcloud components install kubectl \
-        && gcloud components install alpha \
-        && gcloud components install beta \
     && echo "Installing Docker ..." \
         && curl -fsSL https://download.docker.com/linux/$(. /etc/os-release; echo "$ID")/gpg | apt-key add - \
         && add-apt-repository \
@@ -128,12 +108,8 @@ RUN echo "Installing Packages ..." \
         && rm -rf /var/lib/apt/lists/* \
         && sed -i 's/cgroupfs_mount$/#cgroupfs_mount\n/' /etc/init.d/docker \
     && echo "Ensuring Legacy Iptables ..." \
-    && update-alternatives --set iptables /usr/sbin/iptables-legacy \
-    && update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy
-
-ARG OLD_BAZEL_VERSION
-COPY --from=old-bazel \
-    /usr/local/lib/bazel/bin/bazel-real /usr/local/lib/bazel/bin/bazel-${OLD_BAZEL_VERSION}
+        && update-alternatives --set iptables /usr/sbin/iptables-legacy \
+        && update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy
 
 # Copy in release tools from kubernetes/release
 WORKDIR /

images/releng/k8s-ci-builder/Makefile

@@ -26,14 +26,10 @@ TAG ?= $(shell git describe --tags --always --dirty)
 # Build args
 GO_VERSION ?= 1.16.7
 OS_CODENAME ?= buster
-BAZEL_VERSION ?= 3.4.1
-OLD_BAZEL_VERSION ?= 2.2.0
 IMAGE_ARG ?= $(IMAGE):$(TAG)-$(CONFIG)
 
 BUILD_ARGS = --build-arg=GO_VERSION=$(GO_VERSION) \
              --build-arg=OS_CODENAME=$(OS_CODENAME) \
-			 --build-arg=BAZEL_VERSION=$(BAZEL_VERSION) \
-			 --build-arg=OLD_BAZEL_VERSION=$(OLD_BAZEL_VERSION) \
 			 --build-arg=IMAGE_ARG=$(IMAGE_ARG)
 
 # Ensure support for 'docker buildx' and 'docker manifest' commands

images/releng/k8s-ci-builder/ci-failures

@@ -24,8 +24,6 @@ steps:
     - CONFIG=${_CONFIG}
     - GO_VERSION=${_GO_VERSION}
     - OS_CODENAME=${_OS_CODENAME}
-    - BAZEL_VERSION=${_BAZEL_VERSION}
-    - OLD_BAZEL_VERSION=${_OLD_BAZEL_VERSION}
     args:
     - '-c'
     - |
@@ -40,8 +38,6 @@ substitutions:
   _CONFIG: 'config'
   _GO_VERSION: '0.0.0'
   _OS_CODENAME: 'codename'
-  _BAZEL_VERSION: '0.0.0'
-  _OLD_BAZEL_VERSION: '0.0.0'
   _REGISTRY: 'fake.repository/registry-name'
 
 tags:

images/releng/k8s-ci-builder/cloudbuild.yaml

@@ -3,35 +3,23 @@ variants:
     CONFIG: default
     GO_VERSION: '1.16.7'
     OS_CODENAME: 'buster'
-    BAZEL_VERSION: '3.4.1'
-    OLD_BAZEL_VERSION: '2.2.0'
   '1.23':
     CONFIG: '1.23'
     GO_VERSION: '1.17'
     OS_CODENAME: 'buster'
-    BAZEL_VERSION: '3.4.1'
-    OLD_BAZEL_VERSION: '2.2.0'
   '1.22':
     CONFIG: '1.22'
     GO_VERSION: '1.16.7'
     OS_CODENAME: 'buster'
-    BAZEL_VERSION: '3.4.1'
-    OLD_BAZEL_VERSION: '2.2.0'
   '1.21':
     CONFIG: '1.21'
     GO_VERSION: '1.16.7'
     OS_CODENAME: 'buster'
-    BAZEL_VERSION: '3.4.1'
-    OLD_BAZEL_VERSION: '2.2.0'
   '1.20':
     CONFIG: '1.20'
     GO_VERSION: '1.15.15'
     OS_CODENAME: 'buster'
-    BAZEL_VERSION: '3.4.1'
-    OLD_BAZEL_VERSION: '2.2.0'
   '1.19':
     CONFIG: '1.19'
     GO_VERSION: '1.15.15'
     OS_CODENAME: 'buster'
-    BAZEL_VERSION: '2.2.0'
-    OLD_BAZEL_VERSION: '0.23.2'

images/releng/k8s-ci-builder/create_bazel_cache_rcs.sh

@@ -19,8 +19,7 @@
 #
 # Things wrapper.sh handles:
 # - starting / stopping docker-in-docker
-# -- configuring the docker daemon for IPv6
-# - confuring bazel caching
+#   - configuring the docker daemon for IPv6
 # - activating GCP service account credentials
 # - ensuring GOPATH/bin is in PATH
 #
@@ -33,7 +32,7 @@ set -o nounset
 
 >&2 echo "wrapper.sh] [INFO] Wrapping Test Command: \`$*\`"
 >&2 echo "wrapper.sh] [INFO] Running in: ${IMAGE}"
->&2 echo "wrapper.sh] [INFO] See: https://github.com/kubernetes/test-infra/blob/master/images/krte/wrapper.sh"
+>&2 echo "wrapper.sh] [INFO] See: https://git.k8s.io/release/images/releng/k8s-ci-builder/wrapper.sh"
 printf '%0.s=' {1..80} >&2; echo >&2
 >&2 echo "wrapper.sh] [SETUP] Performing pre-test setup ..."
 
@@ -48,6 +47,9 @@ cleanup(){
 
 early_exit_handler() {
   >&2 echo "wrapper.sh] [EARLY EXIT] Interrupted, entering handler ..."
+  if [ -n "${WRAPPED_COMMAND_PID:-}" ]; then
+    kill -TERM "$WRAPPED_COMMAND_PID" || true
+  fi
   if [ -n "${EXIT_VALUE:-}" ]; then
     >&2 echo "Original exit code was ${EXIT_VALUE}, not preserving due to interrupt signal"
   fi
@@ -58,15 +60,6 @@ early_exit_handler() {
 
 trap early_exit_handler TERM INT
 
-# Check if the job has opted-in to bazel remote caching and if so generate
-# .bazelrc entries pointing to the remote cache
-export BAZEL_REMOTE_CACHE_ENABLED=${BAZEL_REMOTE_CACHE_ENABLED:-false}
-if [[ "${BAZEL_REMOTE_CACHE_ENABLED}" == "true" ]]; then
-  >&2 echo "wrapper.sh] [SETUP] Bazel remote cache is enabled, generating .bazelrcs ..."
-  /usr/local/bin/create_bazel_cache_rcs.sh
-  >&2 echo "wrapper.sh] [SETUP] Done setting up .bazelrcs"
-fi
-
 # optionally enable ipv6 docker
 export DOCKER_IN_DOCKER_IPV6_ENABLED=${DOCKER_IN_DOCKER_IPV6_ENABLED:-false}
 if [[ "${DOCKER_IN_DOCKER_IPV6_ENABLED}" == "true" ]]; then
@@ -137,7 +130,9 @@ fi
 printf '%0.s=' {1..80}; echo
 >&2 echo "wrapper.sh] [TEST] Running Test Command: \`$*\` ..."
 set +o errexit
-"$@"
+"$@" &
+WRAPPED_COMMAND_PID=$!
+wait $WRAPPED_COMMAND_PID
 EXIT_VALUE=$?
 set -o errexit
 >&2 echo "wrapper.sh] [TEST] Test Command exit code: ${EXIT_VALUE}"