add RUN_TESTS_DIRS envvar

Takashi Matsuo · Takashi Matsuo · commit 8a97151409ed · 2020-05-28T22:43:46.000Z
diff --git a/.kokoro/tests/run_tests.sh b/.kokoro/tests/run_tests.sh
@@ -101,8 +101,27 @@ for file in **/requirements.txt; do
     file=$(dirname "$file")
     cd "$file"
 
+    # First we look up the environment variable `RUN_TESTS_DIRS`. If
+    # the value is set, we'll iterate through the colon separated
+    # directory list.
+    if [[ -n "${RUN_TESTS_DIRS:-}" ]]; then
+	IFS=":"
+	read -ra run_tests_dirs <<< "${RUN_TESTS_DIRS}"
+	match=0
+	for d in "${run_tests_dirs[@]}"; 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
     # If $DIFF_FROM is set, use it to check for changes in this directory.
-    if [[ -n "${DIFF_FROM:-}" ]] && [[ "${test_all}" == "false" ]]; then
+    elif [[ -n "${DIFF_FROM:-}" ]] && [[ "${test_all}" == "false" ]]; then
         git diff --quiet "$DIFF_FROM" .
         CHANGED=$?
         if [[ "$CHANGED" -eq 0 ]]; then
@@ -146,6 +165,9 @@ for file in **/requirements.txt; do
       echo -e "\n Testing completed.\n"
     fi
 
+    # Remove noxfile.py if it's not tracked by git.
+    git ls-files --error-unmatch noxfile.py > /dev/null 2>&1 | rm noxfile.py
+
 done
 cd "$ROOT"
 
diff --git a/.kokoro/trampoline_v2.sh b/.kokoro/trampoline_v2.sh
@@ -38,6 +38,8 @@
 # TRAMPOLINE_IMAGE_SOURCE: The location of the Dockerfile.
 # RUN_TESTS_SESSION: The nox session to run.
 # TRAMPOLINE_BUILD_FILE: The script to run in the docker container.
+# RUN_TESTS_DIR: A colon separated directory list relative to the
+#                project root.
 
 set -euo pipefail
 
@@ -245,12 +247,13 @@ fi
 # Passing down env vars
 for e in "${pass_down_envvars[@]}"
 do
-    docker_flags+=("--env" "${e}=${!e}")
+    if [[ -n "${!e:-}" ]]; then
+	docker_flags+=("--env" "${e}=${!e}")
+    fi
 done
 
 # If arguments are given, all arguments will become the commands run
 # in the container, otherwise run TRAMPOLINE_BUILD_FILE.
-
 if [[ $# -ge 1 ]]; then
     log_yellow "Running the given commands '" "${@:1}" "' in the container."
     readonly commands=("${@:1}")
diff --git a/.trampolinerc b/.trampolinerc
@@ -18,6 +18,10 @@ required_envvars+=(
 )
 
 pass_down_envvars+=(
+    "BUILD_SPECIFIC_GCLOUD_PROJECT"
+    "REPORT_TO_BUILD_COP_BOT"
+    # The nox session to run.
+    "RUN_TESTS_DIRS"
     "RUN_TESTS_SESSION"
 )
 

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,10 @@ required_envvars+=(`
`18`	`18`	`)`
`19`	`19`
`20`	`20`	`pass_down_envvars+=(`
	`21`	`+ "BUILD_SPECIFIC_GCLOUD_PROJECT"`
	`22`	`+ "REPORT_TO_BUILD_COP_BOT"`
	`23`	`+ # The nox session to run.`
	`24`	`+ "RUN_TESTS_DIRS"`
`21`	`25`	`"RUN_TESTS_SESSION"`
`22`	`26`	`)`
`23`	`27`