address review comments

Takashi Matsuo · Takashi Matsuo · commit 50fb036f43f6 · 2020-05-28T22:43:48.000Z
diff --git a/.kokoro/tests/run_tests.sh b/.kokoro/tests/run_tests.sh
@@ -68,12 +68,12 @@ export GOOGLE_CLIENT_SECRETS=$(pwd)/testing/client-secrets.json
 export DATALABELING_ENDPOINT="test-datalabeling.sandbox.googleapis.com:443"
 
 # Run Cloud SQL proxy (background process exit when script does)
-wget --quiet https://dl.google.com/cloudsql/cloud_sql_proxy.linux.amd64 \
-     -O ${HOME}/cloud_sql_proxy && chmod +x ${HOME}/cloud_sql_proxy
-${HOME}/cloud_sql_proxy -instances="${MYSQL_INSTANCE}"=tcp:3306 &>> \
-       ${HOME}/cloud_sql_proxy.log &
-${HOME}/cloud_sql_proxy -instances="${POSTGRES_INSTANCE}"=tcp:5432 &>> \
+sudo wget --quiet https://dl.google.com/cloudsql/cloud_sql_proxy.linux.amd64 \
+     -O /bin/cloud_sql_proxy && sudo chmod +x /bin/cloud_sql_proxy
+cloud_sql_proxy -instances="${MYSQL_INSTANCE}"=tcp:3306 &>> \
        ${HOME}/cloud_sql_proxy.log &
+cloud_sql_proxy -instances="${POSTGRES_INSTANCE}"=tcp:5432 &>> \
+       ${HOME}/cloud_sql_proxy-postgres.log &
 echo -e "\nCloud SQL proxy started."
 
 echo -e "\n******************** TESTING PROJECTS ********************"
@@ -102,25 +102,36 @@ for file in **/requirements.txt; do
 
     # First we look up the environment variable `RUN_TESTS_DIRS`. If
     # the value is set, we'll iterate through the colon separated
-    # directory list.
+    # directory list. If the target directory is not under any
+    # directory in the list, we skip this directory.
+    # This environment variables are primarily for
+    # `scripts/run_tests_local.sh`.
+    #
+    # The value must be a colon separated list of relative paths from
+    # the project root.
+    #
+    # Example:
+    #   cdn:appengine/flexible
+    #     run tests for `cdn` and `appengine/flexible` directories.
+    #   logging/cloud-client
+    #     only run tests for `logging/cloud-client` directory.
+    #
     if [[ -n "${RUN_TESTS_DIRS:-}" ]]; then
-	IFS=":"
-	read -ra run_tests_dirs <<< "${RUN_TESTS_DIRS}"
 	match=0
-	for d in "${run_tests_dirs[@]}"; do
+	for d in $(echo "${RUN_TESTS_DIRS}" | tr ":" "\n"); do
 	    # If the current dir starts with one of the
 	    # RUN_TESTS_DIRS, we should run the tests.
 	    if [[ "${file}" = "${d}"* ]]; then
 		match=1
 		break
 	    fi
 	done
-	IFS=" "
 	if [[ $match -eq 0 ]]; then
 	    continue
 	fi
+    fi
     # If $DIFF_FROM is set, use it to check for changes in this directory.
-    elif [[ -n "${DIFF_FROM:-}" ]] && [[ "${test_all}" == "false" ]]; then
+    if [[ -n "${DIFF_FROM:-}" ]] && [[ "${test_all}" == "false" ]]; then
         git diff --quiet "$DIFF_FROM" .
         CHANGED=$?
         if [[ "$CHANGED" -eq 0 ]]; then
diff --git a/.kokoro/trampoline_v2.sh b/.kokoro/trampoline_v2.sh
@@ -32,16 +32,19 @@
 # Then run the script.
 # .kokoro/trampoline_v2.sh
 #
-# You can optionally change these environment variables:
-#
+# These environment variables are required:
 # TRAMPOLINE_IMAGE: The docker image to use.
 # TRAMPOLINE_DOCKERFILE: The location of the Dockerfile.
+#
+# You can optionally change these environment variables:
 # TRAMPOLINE_IMAGE_UPLOAD:
 #     (true|false): Whether to upload the Docker image after the
 #                   successful builds.
 # TRAMPOLINE_BUILD_FILE: The script to run in the docker container.
 # TRAMPOLINE_WORKSPACE: The workspace path in the docker container.
 #                       Defaults to /workspace.
+# TRAMPOLINE_SKIP_DOWNLOAD_IMAGE: Skip downloading the image when you
+#                                 know you have the image locally.
 #
 # Potentially there are some repo specific envvars in .trampolinerc in
 # the project root.
@@ -194,19 +197,24 @@ do
     fi
 done
 
-log_yellow "Preparing Docker image."
-# Download the docker image specified by `TRAMPOLINE_IMAGE`
-
-set +e  # ignore error on docker operations
-# We may want to add --max-concurrent-downloads flag.
-
-log_yellow "Start pulling the Docker image: ${TRAMPOLINE_IMAGE}."
-if docker pull "${TRAMPOLINE_IMAGE}"; then
-    log_green "Finished pulling the Docker image: ${TRAMPOLINE_IMAGE}."
+if [[ "${TRAMPOLINE_SKIP_DOWNLOAD_IMAGE:-false}" == "true" ]]; then
+    log_yellow "Re-using the local Docker image."
     has_cache="true"
 else
-    log_red "Failed pulling the Docker image: ${TRAMPOLINE_IMAGE}."
-    has_cache="false"
+    log_yellow "Preparing Docker image."
+    # Download the docker image specified by `TRAMPOLINE_IMAGE`
+
+    set +e  # ignore error on docker operations
+    # We may want to add --max-concurrent-downloads flag.
+
+    log_yellow "Start pulling the Docker image: ${TRAMPOLINE_IMAGE}."
+    if docker pull "${TRAMPOLINE_IMAGE}"; then
+	log_green "Finished pulling the Docker image: ${TRAMPOLINE_IMAGE}."
+	has_cache="true"
+    else
+	log_red "Failed pulling the Docker image: ${TRAMPOLINE_IMAGE}."
+	has_cache="false"
+    fi
 fi
 
 
diff --git a/scripts/run_tests_local.sh b/scripts/run_tests_local.sh
@@ -54,9 +54,8 @@ directory="$(realpath "$1")"
 relative_dir=${directory#"${PROJECT_ROOT}/"}
 export RUN_TESTS_DIRS="${relative_dir}"
 
-if [[ -z "${TRAMPOLINE_DOCKERFILE:-}" ]]; then
-    export TRAMPOLINE_DOCKERFILE="none"
-fi
+# We want to test this directory regardless of whether there's a change.
+export TRAMPOLINE_BUILD_FILE=".kokoro/tests/run_tests.sh"
 
 if [[ $# -ge 2 ]]; then
     sessions=("${@:2}")
@@ -71,4 +70,7 @@ for session in "${sessions[@]}"
 do
     export RUN_TESTS_SESSION="${session}"
     "${PROJECT_ROOT}/.kokoro/trampoline_v2.sh"
+    # We can re-use the image after the first iteration.
+    export TRAMPOLINE_SKIP_DOWNLOAD_IMAGE="true"
+    export TRAMPOLINE_DOCKERFILE="none"
 done
