From b60d00f16f16a517377393233795588e6756836b Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Wed, 7 Oct 2026 17:51:16 +0000 Subject: [PATCH] ci: update Kokoro build config --- .kokoro/build.sh | 4 ++-- .kokoro/common.cfg | 20 ++++---------------- .kokoro/trampoline.sh | 24 ------------------------ 3 files changed, 6 insertions(+), 42 deletions(-) delete mode 100755 .kokoro/trampoline.sh diff --git a/.kokoro/build.sh b/.kokoro/build.sh index eda70322e..81abc4195 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -16,7 +16,7 @@ set -eo pipefail -cd github/synthtool +cd "$(dirname "$0")/.." # Disable buffering, so that the logs stream through. export PYTHONUNBUFFERED=1 @@ -25,4 +25,4 @@ export PYTHONUNBUFFERED=1 nox -s lint test # remove all files, preventing kokoro from trying to sync them. -rm -rf * +rm -rf * \ No newline at end of file diff --git a/.kokoro/common.cfg b/.kokoro/common.cfg index 653d0e51e..081634145 100644 --- a/.kokoro/common.cfg +++ b/.kokoro/common.cfg @@ -1,19 +1,7 @@ # Format: //devtools/kokoro/config/proto/build.proto -# Download trampoline resources. -gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" +build_file: "github/build-dir/.kokoro/build.sh" -# Use the trampoline script to run in docker. -build_file: "synthtool/.kokoro/trampoline.sh" - -# Configure the docker image for kokoro-trampoline. -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/python" -} - -# Tell the trampoline which build file to use. -env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/synthtool/.kokoro/build.sh" -} +container_properties { + docker_image: "us-central1-docker.pkg.dev/client-library-releases/release-images-prod/python-multi@sha256:7cbcd29934e457c5f8b146b31026e786e6e3f9e182fcbb00ab52331202b9bb9a" +} \ No newline at end of file diff --git a/.kokoro/trampoline.sh b/.kokoro/trampoline.sh deleted file mode 100755 index 0efc3be38..000000000 --- a/.kokoro/trampoline.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash -# Copyright 2017 Google 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. -set -eo pipefail -# Always run the cleanup script, regardless of the success of bouncing into -# the container. -function cleanup() { - chmod +x ${KOKORO_GFILE_DIR}/trampoline_cleanup.sh - ${KOKORO_GFILE_DIR}/trampoline_cleanup.sh - echo "cleanup"; -} -trap cleanup EXIT -python3 "${KOKORO_GFILE_DIR}/trampoline_v1.py"