diff --git a/tools/jenkins/build_docker_and_run_tests.sh b/tools/jenkins/build_docker_and_run_tests.sh index 6e3166ce579..5bb2b6b1886 100755 --- a/tools/jenkins/build_docker_and_run_tests.sh +++ b/tools/jenkins/build_docker_and_run_tests.sh @@ -66,6 +66,7 @@ docker run \ -i $TTY_FLAG \ -v "$git_root:/var/local/jenkins/grpc" \ -v /tmp/ccache:/tmp/ccache \ + -v /tmp/npm-cache:/tmp/npm-cache \ -v /tmp/xdg-cache-home:/tmp/xdg-cache-home \ -v /var/run/docker.sock:/var/run/docker.sock \ -v $(which docker):/bin/docker \ diff --git a/tools/jenkins/grpc_jenkins_slave/Dockerfile b/tools/jenkins/grpc_jenkins_slave/Dockerfile index 129a8db24fa..5b8c24c076c 100644 --- a/tools/jenkins/grpc_jenkins_slave/Dockerfile +++ b/tools/jenkins/grpc_jenkins_slave/Dockerfile @@ -101,7 +101,7 @@ ENV NUGET mono /var/local/NuGet.exe # Install nvm RUN touch .profile RUN curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.25.4/install.sh | bash -RUN /bin/bash -l -c "nvm install 0.12" +RUN /bin/bash -l -c "nvm install 0.12 && npm config set cache /tmp/npm-cache" ################## # Ruby dependencies diff --git a/tools/jenkins/grpc_jenkins_slave_32bits/Dockerfile b/tools/jenkins/grpc_jenkins_slave_32bits/Dockerfile index 81a03990916..7179a50cc59 100644 --- a/tools/jenkins/grpc_jenkins_slave_32bits/Dockerfile +++ b/tools/jenkins/grpc_jenkins_slave_32bits/Dockerfile @@ -101,7 +101,7 @@ ENV NUGET mono /var/local/NuGet.exe # Install nvm RUN touch .profile RUN curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.25.4/install.sh | bash -RUN /bin/bash -l -c "nvm install 0.12" +RUN /bin/bash -l -c "nvm install 0.12 && npm config set cache /tmp/npm-cache" ################## # Ruby dependencies diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index ce1e0887f2d..ceeee739212 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -192,7 +192,8 @@ class NodeLanguage(object): environ=_FORCE_ENVIRON_FOR_WRAPPERS)] def pre_build_steps(self): - return [] + # Default to 1 week cache expiration + return [['npm', 'update', '--cache-min', '604800']] def make_targets(self): return []