From 3c3c32a0592ce3bed18b7315feec199a2fe9be84 Mon Sep 17 00:00:00 2001 From: David Neto Date: Wed, 19 Feb 2025 10:01:24 -0500 Subject: [PATCH] kokoro: use lightweight license-checker image (#143) BUG=393622588 --- .../license-check/{presubmit.sh => build.sh} | 6 ++---- kokoro/license-check/presubmit-docker.sh | 19 ------------------- kokoro/license-check/presubmit.cfg | 2 +- 3 files changed, 3 insertions(+), 24 deletions(-) rename kokoro/license-check/{presubmit.sh => build.sh} (80%) delete mode 100755 kokoro/license-check/presubmit-docker.sh diff --git a/kokoro/license-check/presubmit.sh b/kokoro/license-check/build.sh similarity index 80% rename from kokoro/license-check/presubmit.sh rename to kokoro/license-check/build.sh index 76afcd9..8b109e5 100755 --- a/kokoro/license-check/presubmit.sh +++ b/kokoro/license-check/build.sh @@ -20,8 +20,6 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd )" ROOT_DIR="$( cd "${SCRIPT_DIR}/../.." >/dev/null 2>&1 && pwd )" docker run --rm -i \ - --volume "${ROOT_DIR}:${ROOT_DIR}" \ - --volume "${KOKORO_ARTIFACTS_DIR}:/mnt/artifacts" \ + --volume "${ROOT_DIR}:${ROOT_DIR}:ro" \ --workdir "${ROOT_DIR}" \ - --entrypoint "${SCRIPT_DIR}/presubmit-docker.sh" \ - "gcr.io/shaderc-build/radial-build:latest" + us-east4-docker.pkg.dev/shaderc-build/radial-docker/ubuntu-24.04-amd64/license-checker diff --git a/kokoro/license-check/presubmit-docker.sh b/kokoro/license-check/presubmit-docker.sh deleted file mode 100755 index 31e39f3..0000000 --- a/kokoro/license-check/presubmit-docker.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -# Copyright 2020 The Marl 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 -# -# https://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 -e # Fail on any error. - -license-checker diff --git a/kokoro/license-check/presubmit.cfg b/kokoro/license-check/presubmit.cfg index bacde18..271ad2f 100644 --- a/kokoro/license-check/presubmit.cfg +++ b/kokoro/license-check/presubmit.cfg @@ -1,4 +1,4 @@ # Format: //devtools/kokoro/config/proto/build.proto -build_file: "cppdap/kokoro/license-check/presubmit.sh" +build_file: "cppdap/kokoro/license-check/build.sh"