diff --git a/kokoro/common.cfg b/kokoro/common.cfg new file mode 100644 index 0000000..e91b11b --- /dev/null +++ b/kokoro/common.cfg @@ -0,0 +1,4 @@ +env_vars { + key: "LINUX_BUILDER_IMAGE" + value: "us-east4-docker.pkg.dev/shaderc-build/radial-docker/radial-ubuntu-2404-amd64-lean" +} 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.sh b/kokoro/license-check/presubmit.sh index 76afcd9..61d7613 100755 --- a/kokoro/license-check/presubmit.sh +++ b/kokoro/license-check/presubmit.sh @@ -21,7 +21,5 @@ 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" \ --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/ubuntu/presubmit.sh b/kokoro/ubuntu/presubmit.sh index 3b75439..c59521e 100755 --- a/kokoro/ubuntu/presubmit.sh +++ b/kokoro/ubuntu/presubmit.sh @@ -29,4 +29,4 @@ docker run --rm -i \ --env BUILD_TARGET_ARCH=$BUILD_TARGET_ARCH \ --env BUILD_SANITIZER=$BUILD_SANITIZER \ --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/lean