change TRAMPOLINE_IMAGE_SOURCE to TRAMPOLINE_DOCKERFILE

Takashi Matsuo · Takashi Matsuo · commit b3f93a189e92 · 2020-05-28T22:43:48.000Z
diff --git a/.kokoro/trampoline_v2.sh b/.kokoro/trampoline_v2.sh
@@ -35,7 +35,7 @@
 # You can optionally change these environment variables:
 #
 # TRAMPOLINE_IMAGE: The docker image to use.
-# TRAMPOLINE_IMAGE_SOURCE: The location of the Dockerfile.
+# TRAMPOLINE_DOCKERFILE: The location of the Dockerfile.
 # TRAMPOLINE_IMAGE_UPLOAD:
 #     (true|false): Whether to upload the Docker image after the
 #                   successful builds.
@@ -219,11 +219,11 @@ user_name="$(id -un)"
 docker_gid=$(cut -d: -f3 < <(getent group docker))
 
 update_cache="false"
-if [[ "${TRAMPOLINE_IMAGE_SOURCE:-none}" != "none" ]]; then
+if [[ "${TRAMPOLINE_DOCKERFILE:-none}" != "none" ]]; then
     # Build the Docker image from the source.
-    context_dir=$(dirname "${TRAMPOLINE_IMAGE_SOURCE}")
+    context_dir=$(dirname "${TRAMPOLINE_DOCKERFILE}")
     docker_build_flags=(
-	"-f" "${TRAMPOLINE_IMAGE_SOURCE}"
+	"-f" "${TRAMPOLINE_DOCKERFILE}"
 	"-t" "${TRAMPOLINE_IMAGE}"
 	"--build-arg" "UID=${user_uid}"
 	"--build-arg" "GID=${user_gid}"
diff --git a/.trampolinerc b/.trampolinerc
@@ -45,8 +45,8 @@ if [[ -z "${TRAMPOLINE_IMAGE:-}" ]]; then
     TRAMPOLINE_IMAGE="gcr.io/cloud-devrel-kokoro-resources/python-samples-testing-docker"
 fi
 
-if [[ -z "${TRAMPOLINE_IMAGE_SOURCE:-}" ]]; then
-    TRAMPOLINE_IMAGE_SOURCE=".kokoro/docker/Dockerfile"
+if [[ -z "${TRAMPOLINE_DOCKERFILE:-}" ]]; then
+    TRAMPOLINE_DOCKERFILE=".kokoro/docker/Dockerfile"
 fi
 
 if [[ -z "${RUN_TESTS_SESSION:-}" ]]; then
diff --git a/.trampolinerc_tmpl b/.trampolinerc_tmpl
@@ -37,8 +37,8 @@ if [[ -z "${TRAMPOLINE_IMAGE:-}" ]]; then
     # TRAMPOLINE_IMAGE="gcr.io/cloud-devrel-kokoro-resources/python-samples-testing-docker"
 fi
 
-if [[ -z "${TRAMPOLINE_IMAGE_SOURCE:-}" ]]; then
-    # TRAMPOLINE_IMAGE_SOURCE=".kokoro/docker/Dockerfile"
+if [[ -z "${TRAMPOLINE_DOCKERFILE:-}" ]]; then
+    # TRAMPOLINE_DOCKERFILE=".kokoro/docker/Dockerfile"
 fi
 
 if [[ -z "${TRAMPOLINE_BUILD_FILE:-}" ]]; then
diff --git a/scripts/run_tests_local.sh b/scripts/run_tests_local.sh
@@ -54,8 +54,8 @@ directory="$(realpath "$1")"
 relative_dir=${directory#"${PROJECT_ROOT}/"}
 export RUN_TESTS_DIRS="${relative_dir}"
 
-if [[ -z "${TRAMPOLINE_IMAGE_SOURCE:-}" ]]; then
-    export TRAMPOLINE_IMAGE_SOURCE="none"
+if [[ -z "${TRAMPOLINE_DOCKERFILE:-}" ]]; then
+    export TRAMPOLINE_DOCKERFILE="none"
 fi
 
 if [[ $# -ge 2 ]]; then
