diff options
| -rw-r--r-- | tools/internal_ci/helper_scripts/prepare_build_linux_rc | 5 | ||||
| -rwxr-xr-x | tools/run_tests/dockerize/build_docker_and_run_tests.sh | 6 | ||||
| -rwxr-xr-x | tools/run_tests/dockerize/docker_run_tests.sh | 4 |
3 files changed, 0 insertions, 15 deletions
diff --git a/tools/internal_ci/helper_scripts/prepare_build_linux_rc b/tools/internal_ci/helper_scripts/prepare_build_linux_rc index 8715d6c8e0..74bbc85d72 100644 --- a/tools/internal_ci/helper_scripts/prepare_build_linux_rc +++ b/tools/internal_ci/helper_scripts/prepare_build_linux_rc @@ -27,11 +27,6 @@ echo 'DOCKER_OPTS="${DOCKER_OPTS} --graph=/tmpfs/docker"' | sudo tee --append /e echo 'DOCKER_OPTS="${DOCKER_OPTS} --registry-mirror=https://mirror.gcr.io"' | sudo tee --append /etc/default/docker sudo service docker restart -# Populate xdg-cache-home to workaround https://github.com/grpc/grpc/issues/11968 -sudo mkdir -p /tmp/xdg-cache-home -PYTHONWARNINGS=ignore XDG_CACHE_HOME=/tmp/xdg-cache-home sudo -E pip install setuptools wheel -PYTHONWARNINGS=ignore XDG_CACHE_HOME=/tmp/xdg-cache-home sudo -E pip install coverage==4.4 pylint==1.6.5 - # Download Docker images from DockerHub export DOCKERHUB_ORGANIZATION=grpctesting diff --git a/tools/run_tests/dockerize/build_docker_and_run_tests.sh b/tools/run_tests/dockerize/build_docker_and_run_tests.sh index 8dca05ea35..21eccbaac9 100755 --- a/tools/run_tests/dockerize/build_docker_and_run_tests.sh +++ b/tools/run_tests/dockerize/build_docker_and_run_tests.sh @@ -25,10 +25,6 @@ cd - # Ensure existence of ccache directory mkdir -p /tmp/ccache -# Ensure existence of the home directory for XDG caches (e.g. what pip uses for -# its cache location now that --download-cache is deprecated). -mkdir -p /tmp/xdg-cache-home - # Inputs # DOCKERFILE_DIR - Directory in which Dockerfile file is located. # DOCKER_RUN_SCRIPT - Script to run under docker (relative to grpc repo root) @@ -61,7 +57,6 @@ docker run \ -e "config=$config" \ -e "arch=$arch" \ -e CCACHE_DIR=/tmp/ccache \ - -e XDG_CACHE_HOME=/tmp/xdg-cache-home \ -e THIS_IS_REALLY_NEEDED='see https://github.com/docker/docker/issues/14203 for why docker is awful' \ -e HOST_GIT_ROOT="$git_root" \ -e LOCAL_GIT_ROOT=$docker_instance_git_root \ @@ -79,7 +74,6 @@ docker run \ -v "$git_root:$docker_instance_git_root" \ -v /tmp/ccache:/tmp/ccache \ -v /tmp/npm-cache:/tmp/npm-cache \ - -v /tmp/xdg-cache-home:/tmp/xdg-cache-home \ -w /var/local/git/grpc \ --name="$CONTAINER_NAME" \ "$DOCKER_IMAGE_NAME" \ diff --git a/tools/run_tests/dockerize/docker_run_tests.sh b/tools/run_tests/dockerize/docker_run_tests.sh index df9d3d1ca2..89ee315fd2 100755 --- a/tools/run_tests/dockerize/docker_run_tests.sh +++ b/tools/run_tests/dockerize/docker_run_tests.sh @@ -22,10 +22,6 @@ export CONFIG=$config export ASAN_SYMBOLIZER_PATH=/usr/bin/llvm-symbolizer export PATH=$PATH:/usr/bin/llvm-symbolizer -# Ensure that programs depending on current-user-ownership of cache directories -# are satisfied (it's being mounted from outside the image). -chown "$(whoami)" "$XDG_CACHE_HOME" - mkdir -p /var/local/git git clone /var/local/jenkins/grpc /var/local/git/grpc # clone gRPC submodules, use data from locally cloned submodules where possible |