aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xkokoro/linux/build_and_run_docker.sh2
-rw-r--r--python/tox.ini3
2 files changed, 4 insertions, 1 deletions
diff --git a/kokoro/linux/build_and_run_docker.sh b/kokoro/linux/build_and_run_docker.sh
index 6a1f327a..f9c60710 100755
--- a/kokoro/linux/build_and_run_docker.sh
+++ b/kokoro/linux/build_and_run_docker.sh
@@ -35,6 +35,8 @@ echo $git_root
docker run \
"$@" \
-e CCACHE_DIR=$CCACHE_DIR \
+ -e KOKORO_BUILD_NUMBER=$KOKORO_BUILD_NUMBER \
+ -e KOKORO_BUILD_ID=$KOKORO_BUILD_ID \
-e EXTERNAL_GIT_ROOT="/var/local/kokoro/protobuf" \
-e TEST_SET="$TEST_SET" \
-e THIS_IS_REALLY_NEEDED='see https://github.com/docker/docker/issues/14203 for why docker is awful' \
diff --git a/python/tox.ini b/python/tox.ini
index 38a81b4f..4eb319d2 100644
--- a/python/tox.ini
+++ b/python/tox.ini
@@ -4,7 +4,8 @@ envlist =
[testenv]
usedevelop=true
-passenv = CC
+passenv =
+ CC KOKORO_BUILD_ID KOKORO_BUILD_NUMBER
setenv =
cpp: LD_LIBRARY_PATH={toxinidir}/../src/.libs
cpp: DYLD_LIBRARY_PATH={toxinidir}/../src/.libs