Take 2

ace-n · ace-n · commit e2931af4ad79 · 2020-08-20T16:45:10.000-07:00
diff --git a/.kokoro/tests/run_tests.sh b/.kokoro/tests/run_tests.sh
@@ -13,6 +13,22 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# Only run Python 2.7 if the PR in question has a `kokoro-lite` label
+if [[ ! -z "$KOKORO_GITHUB_PULL_REQUEST_NUMBER" ]]; then
+    set +e
+    curl -s "https://api.github.com/repos/GoogleCloudPlatform/python-docs-samples/pulls/$KOKORO_GITHUB_PULL_REQUEST_NUMBER" \
+     | grep "kokoro:lite" > /dev/null
+    if [[ $? -eq 0 ]] && [[ "${RUN_TESTS_SESSION}" != "py-2.7" ]]; then
+        # Skip this build
+        echo "This build is being skipped!"
+        echo "  GitHub PRs with the 'kokoro:lite'"
+        echo "  label are ONLY tested in Python 2.7"
+
+        exit 1
+    fi
+    set -e
+fi
+
 # `-e` enables the script to automatically fail when a command fails
 # `-o pipefail` sets the exit code to the rightmost comment to exit with a non-zero
 set -eo pipefail
@@ -51,20 +67,6 @@ if [[ $* == *--only-diff-head* ]]; then
     fi
 fi
 
-# Only run Python 2.7 if the PR in question has a `kokoro-lite` label
-if [[ ! -z $KOKORO_GITHUB_PULL_REQUEST_NUMBER ]]; then
-    curl -s "https://api.github.com/repos/GoogleCloudPlatform/python-docs-samples/pulls/$KOKORO_GITHUB_PULL_REQUEST_NUMBER" \
-     | grep "kokoro:lite" > /dev/null
-    if [[ $? -eq 0 ]] && [[ "${RUN_TESTS_SESSION}" != "py-2.7" ]]; then
-        # Skip this build
-        echo "This build is being skipped!"
-        echo "  GitHub PRs with the 'kokoro:lite'"
-        echo "  label are ONLY tested in Python 2.7"
-
-        exit 1
-    fi
-fi
-
 # Because Kokoro runs presubmit builds simalteneously, we often see
 # quota related errors. I think we can avoid this by changing the
 # order of tests to execute (e.g. reverse order for py-3.8
diff --git a/.kokoro/trampoline_v2.sh b/.kokoro/trampoline_v2.sh
@@ -418,6 +418,9 @@ docker_flags=(
     "--env" "KOKORO_GFILE_DIR=/secrets/gfile"
     "--volume" "${KOKORO_KEYSTORE_DIR:-/dev/shm}:/secrets/keystore"
     "--env" "KOKORO_KEYSTORE_DIR=/secrets/keystore"
+
+    # Pass down the GitHub pull request number
+    "--env" "KOKORO_GITHUB_PULL_REQUEST_NUMBER=${KOKORO_GITHUB_PULL_REQUEST_NUMBER}"
 )
 
 # Add an option for nicer output if the build gets a tty.

Original file line number	Diff line number	Diff line change
`@@ -418,6 +418,9 @@ docker_flags=(`
`418`	`418`	`"--env" "KOKORO_GFILE_DIR=/secrets/gfile"`
`419`	`419`	`"--volume" "${KOKORO_KEYSTORE_DIR:-/dev/shm}:/secrets/keystore"`
`420`	`420`	`"--env" "KOKORO_KEYSTORE_DIR=/secrets/keystore"`
	`421`	`+`
	`422`	`+ # Pass down the GitHub pull request number`
	`423`	`+ "--env" "KOKORO_GITHUB_PULL_REQUEST_NUMBER=${KOKORO_GITHUB_PULL_REQUEST_NUMBER}"`
`421`	`424`	`)`
`422`	`425`
`423`	`426`	`# Add an option for nicer output if the build gets a tty.`